updates for making dist, new internal fcn getline_xgrapgh
This commit is contained in:
parent
af32733fa8
commit
d080f6dfc0
11
Makefile.am
11
Makefile.am
|
|
@ -1,13 +1,13 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
SUBDIRS = @XGRAPHDIR@ doc src man tests
|
||||
DIST_SUBDIRS = @XGRAPHDIR@ doc src man tests
|
||||
SUBDIRS = @XGRAPHDIR@ src man tests
|
||||
DIST_SUBDIRS = @XGRAPHDIR@ src man tests
|
||||
|
||||
EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes \
|
||||
ANALYSES BUGS AUTHORS ChangeLog \
|
||||
DEVICES NEWS README README.tcl \
|
||||
README.adms contrib \
|
||||
examples visualc @NOTXGRAPH@
|
||||
examples visualc manual @NOTXGRAPH@
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
|
||||
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/include -name CVS`
|
||||
rm -rf `find $(distdir)/xgraph -name CVS`
|
||||
rm -rf `find $(distdir)/xgraph/bitmaps CVS`
|
||||
rm -rf `find $(distdir)/xgraph/examples CVS`
|
||||
rm -rf `find $(distdir)/xgraph/bitmaps -name CVS`
|
||||
rm -rf `find $(distdir)/xgraph/examples -name CVS`
|
||||
rm -rf `find $(distdir)/unsupported -name CVS`
|
||||
rm -rf `find $(distdir)/xgraph -name .cvsignore`
|
||||
rm -rf `find $(distdir)/xgraph -name .deps`
|
||||
|
||||
mrproper: maintainer-clean
|
||||
rm -f `find . -type f -name "*~" -print`
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
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
|
||||
|
||||
|
|
@ -193,6 +193,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
|
|||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
parse-bison.c parse-bison.h : parse-bison.y
|
||||
parse-bison-inc.c parse-bison-inc.h : parse-bison.y
|
||||
bison $<
|
||||
parse.c : parse-bison.c
|
||||
parse.c : parse-bison-inc.c
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ noinst_HEADERS = \
|
|||
cm.h \
|
||||
cmproto.h \
|
||||
cmtypes.h \
|
||||
compatmode.h \
|
||||
complex.h \
|
||||
const.h \
|
||||
contdefs.h \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
EXTRA_DIST = inpptree-parser.y
|
||||
|
||||
noinst_LTLIBRARIES = libinp.la
|
||||
|
||||
libinp_la_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ TESTS = \
|
|||
TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
|
||||
|
||||
EXTRA_DIST = \
|
||||
nmos4p1.mod \
|
||||
pmos4p1.mod \
|
||||
nmos4p3.mod \
|
||||
pmos4p3.mod \
|
||||
$(TESTS) \
|
||||
$(TESTS:.cir=.out)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ static short gray_bits[] =
|
|||
|
||||
static void make_msg_box();
|
||||
static void del_msg_box();
|
||||
static int getline_xgraph(char**,char*);
|
||||
|
||||
|
||||
#define D_VPAD 2
|
||||
|
|
@ -777,7 +778,7 @@ xtb_frame *frame; /* Returned frame */
|
|||
memset(new_info->lines, 0, sizeof(Window) * E_LINES);
|
||||
|
||||
lineptr = text;
|
||||
while (getline(&lineptr, line)) {
|
||||
while (getline_xgraph(&lineptr, line)) {
|
||||
if (new_info->num_lines >= new_info->alloc_lines) {
|
||||
int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window);
|
||||
new_info->alloc_lines *= 2;
|
||||
|
|
@ -887,8 +888,8 @@ char *err_text;
|
|||
|
||||
|
||||
|
||||
int
|
||||
getline(tptr, lptr)
|
||||
static int
|
||||
getline_xgraph(tptr, lptr)
|
||||
char **tptr;
|
||||
char *lptr;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue