updates for making dist, new internal fcn getline_xgrapgh

This commit is contained in:
h_vogt 2010-05-30 09:26:34 +00:00
parent af32733fa8
commit d080f6dfc0
6 changed files with 18 additions and 13 deletions

View File

@ -1,13 +1,13 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = @XGRAPHDIR@ doc src man tests SUBDIRS = @XGRAPHDIR@ src man tests
DIST_SUBDIRS = @XGRAPHDIR@ doc src man tests DIST_SUBDIRS = @XGRAPHDIR@ src man tests
EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes \ EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes \
ANALYSES BUGS AUTHORS ChangeLog \ ANALYSES BUGS AUTHORS ChangeLog \
DEVICES NEWS README README.tcl \ DEVICES NEWS README README.tcl \
README.adms contrib \ README.adms contrib \
examples visualc @NOTXGRAPH@ examples visualc manual @NOTXGRAPH@
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \ config.h.in config.sub configure install-sh \
@ -21,10 +21,11 @@ dist-hook:
rm -rf `find $(distdir)/visualc -name CVS` rm -rf `find $(distdir)/visualc -name CVS`
rm -rf `find $(distdir)/visualc/include -name CVS` rm -rf `find $(distdir)/visualc/include -name CVS`
rm -rf `find $(distdir)/xgraph -name CVS` rm -rf `find $(distdir)/xgraph -name CVS`
rm -rf `find $(distdir)/xgraph/bitmaps CVS` rm -rf `find $(distdir)/xgraph/bitmaps -name CVS`
rm -rf `find $(distdir)/xgraph/examples CVS` rm -rf `find $(distdir)/xgraph/examples -name CVS`
rm -rf `find $(distdir)/unsupported -name CVS` rm -rf `find $(distdir)/unsupported -name CVS`
rm -rf `find $(distdir)/xgraph -name .cvsignore` rm -rf `find $(distdir)/xgraph -name .cvsignore`
rm -rf `find $(distdir)/xgraph -name .deps`
mrproper: maintainer-clean mrproper: maintainer-clean
rm -f `find . -type f -name "*~" -print` rm -f `find . -type f -name "*~" -print`

View File

@ -3,7 +3,7 @@
SUBDIRS = plotting help parser wdisp numparam SUBDIRS = plotting help parser wdisp numparam
DIST_SUBDIRS = plotting help parser wdisp numparam DIST_SUBDIRS = plotting help parser wdisp numparam
EXTRA_DIST = testcommands.c EXTRA_DIST = testcommands.c parse-bison.y
noinst_LTLIBRARIES = libfte.la noinst_LTLIBRARIES = libfte.la
@ -193,6 +193,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
parse-bison.c parse-bison.h : parse-bison.y parse-bison-inc.c parse-bison-inc.h : parse-bison.y
bison $< bison $<
parse.c : parse-bison.c parse.c : parse-bison-inc.c

View File

@ -15,6 +15,7 @@ noinst_HEADERS = \
cm.h \ cm.h \
cmproto.h \ cmproto.h \
cmtypes.h \ cmtypes.h \
compatmode.h \
complex.h \ complex.h \
const.h \ const.h \
contdefs.h \ contdefs.h \

View File

@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
EXTRA_DIST = inpptree-parser.y
noinst_LTLIBRARIES = libinp.la noinst_LTLIBRARIES = libinp.la
libinp_la_SOURCES = \ libinp_la_SOURCES = \

View File

@ -15,8 +15,8 @@ TESTS = \
TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
EXTRA_DIST = \ EXTRA_DIST = \
nmos4p1.mod \ nmos4p3.mod \
pmos4p1.mod \ pmos4p3.mod \
$(TESTS) \ $(TESTS) \
$(TESTS:.cir=.out) $(TESTS:.cir=.out)

View File

@ -33,6 +33,7 @@ static short gray_bits[] =
static void make_msg_box(); static void make_msg_box();
static void del_msg_box(); static void del_msg_box();
static int getline_xgraph(char**,char*);
#define D_VPAD 2 #define D_VPAD 2
@ -777,7 +778,7 @@ xtb_frame *frame; /* Returned frame */
memset(new_info->lines, 0, sizeof(Window) * E_LINES); memset(new_info->lines, 0, sizeof(Window) * E_LINES);
lineptr = text; lineptr = text;
while (getline(&lineptr, line)) { while (getline_xgraph(&lineptr, line)) {
if (new_info->num_lines >= new_info->alloc_lines) { if (new_info->num_lines >= new_info->alloc_lines) {
int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window); int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window);
new_info->alloc_lines *= 2; new_info->alloc_lines *= 2;
@ -887,8 +888,8 @@ char *err_text;
int static int
getline(tptr, lptr) getline_xgraph(tptr, lptr)
char **tptr; char **tptr;
char *lptr; char *lptr;