Fixed a potential crash condition in uniquepins().

infinite loop if attempting to flatten an empty cell.

VERSION

@@ -1 +1 @@
-1.5.48
+1.5.51

base/flatten.c

@@ -915,7 +915,7 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
 	       }
 	    }
 	    tob = tob->next;
-	    if (tob->type != PORT && tob->type != UNKNOWN) break;
+	    if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
 	 }
 
 	 /* 2nd pass---remove the pins */
@@ -941,7 +941,7 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
 	       ob = ob->next;
 	    }
 	    tob = tob->next;
-	    if (tob->type != PORT && tob->type != UNKNOWN) break;
+	    if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
 	 }
 
 	 // Renumber the pins in order.  Since when removing duplicates, the
@@ -1348,7 +1348,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
     // Find all instances of one cell that have fewer in
     // the compared circuit.  Check whether subcircuits
     // in the hierarchy of each instance contain devices
-    // or subcircuits that more in the compared circuit.
+    // or subcircuits that have more in the compared circuit.
 
     ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
     while (ecomp != NULL) {
@@ -1386,12 +1386,15 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		}
 	    }
 	    if (match) {
-		flattenInstancesOf(name2, file2, ecomp->cell2->name); 
-		flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		if (ecomp->cell2)
+		    flattenInstancesOf(name2, file2, ecomp->cell2->name); 
+		if (ecomp->cell1)
+		    flattenInstancesOf(name1, file1, ecomp->cell1->name); 
 		modified++;
 	    }
 
 	    /* Reset or apply the count adjustments */
+	    if (ecomp->cell2)
 	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
 		if (ob2->type == FIRSTPIN) {
 		    ncomp = (ECompare *)HashLookup(ob2->model.class,

base/netcmp.c

@@ -2674,8 +2674,8 @@ int FlattenUnmatched(struct nlist *tc, char *parent, int stoplevel, int loclevel
 
    changed = 1;
    while (changed) {
+      changed = 0;
       for (ob = tc->cell; ob != NULL; ob = ob->next) {
-	 changed = 0;
          tcsub = NULL;
          if (ob->type == FIRSTPIN) {
 	    /* First check if there is a class equivalent */
@@ -3243,6 +3243,10 @@ int Iterate(void)
 /* return the number of mismatched properties (0 = perfect	*/
 /* match of all properties, or there were no properties to	*/
 /* compare).							*/
+/*								*/
+/* NOTE:  ob1 must belong to Circuit1, and ob2 must belong to	*/
+/* Circuit2.  The calling procedure is responsble for ensuring	*/
+/* that this is true.						*/
 /*--------------------------------------------------------------*/
 
 int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
@@ -3278,8 +3282,10 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
       if (t1type != PROPERTY) return 0;
 
    // Sanity check---shouldn't happen
-   if ((t1type == PROPERTY) && (tp1->instance.props == NULL)) t1type = UNKNOWN;
-   if ((t2type == PROPERTY) && (tp2->instance.props == NULL)) t2type = UNKNOWN;
+   if (tp1 && (t1type == PROPERTY) && (tp1->instance.props == NULL))
+	t1type = UNKNOWN;
+   if (tp2 && (t2type == PROPERTY) && (tp2->instance.props == NULL))
+	t2type = UNKNOWN;
 
    if ((t1type != PROPERTY) && (t2type != PROPERTY)) return 0;  
 
@@ -3737,7 +3743,11 @@ int ResolveAutomorphsByProperty()
 		badmatch = FALSE;
 		for (E2 = E1->next; E2 != NULL; E2 = E2->next) {
 		    if (E2->hashval != orighash) continue;
-		    result = PropertyMatch(E1->object, E2->object, FALSE);
+		    if (E2->graph == E1->graph) continue;
+		    if (E1->graph == Circuit1->file) 
+			result = PropertyMatch(E1->object, E2->object, FALSE);
+		    else
+			result = PropertyMatch(E2->object, E1->object, FALSE);
 		    if (result == 0) {
 			E2->hashval = newhash;
 			if (E2->graph == E1->graph)
@@ -4310,6 +4320,7 @@ int EquivalenceClasses(char *name1, int file1, char *name2, int file2)
    char *class1, *class2;
    struct Correspond *newc;
    struct nlist *tp, *tp2;
+   unsigned char need_new_seed = 0;
 
    if (file1 != -1 && file2 != -1) {
 
@@ -4317,7 +4328,34 @@ int EquivalenceClasses(char *name1, int file1, char *name2, int file2)
       if (tp && (*matchfunc)(tp->name, name2))
 	 return 1;	/* Already equivalent */
 
+      /* Do a cross-check for each name in the other netlist.  If 	*/
+      /* conflicting names exist, then alter the classhash to make it	*/
+      /* unique.							*/
+
+      tp = LookupCellFile(name1, file2);
+      if (tp != NULL) need_new_seed = 1;
+      tp = LookupCellFile(name2, file1);
+      if (tp != NULL) need_new_seed = 1;
+
+      /* Now make the classhash values the same so that these cells	*/
+      /* are indistinguishable by the netlist comparator.		*/
+
       tp = LookupCellFile(name1, file1);
+      if (need_new_seed == 1) {
+	 char *altname;
+	 while (need_new_seed == 1) {
+	    altname = (char *)MALLOC(strlen(name1) + 2);
+	    sprintf(altname, "%s%c", name1, (char)(65 + Random(26)));
+	    tp->classhash = (*hashfunc)(altname, 0);
+
+	    /* Make sure randomly-altered name is not in any netlist */
+	    if ((LookupCellFile(altname, file1) == NULL) &&
+			(LookupCellFile(altname, file2) == NULL))
+		need_new_seed = 0;
+
+	    FREE(altname);
+	 }
+      }
       tp2 = LookupCellFile(name2, file2);
       tp2->classhash = tp->classhash;
       return 1;

base/spice.c

@@ -520,6 +520,10 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	 int n;
 	 char *ds;
 
+	 // NOTE:  Use this to ignore the new definition---should be
+	 // an option to netgen.
+	 /* goto skip_ends; */
+
 	 ds = strrchr(model, '[');
 	 if ((ds != NULL) && (*(ds + 1) == '['))
 	    sscanf(ds + 2, "%d", &n);

defs.mak

@@ -24,8 +24,8 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL}
 
 # Override standard "make" target when compiling under TCL
-ALL_TARGET = standard
-INSTALL_TARGET = install-netgen
+ALL_TARGET = tcl
+INSTALL_TARGET = install-tcl
 
 # Change CADDIR to install in a different place
 BINDIR                 = ${bindir}
@@ -34,16 +34,16 @@ LIBDIR                 = ${libdir}
 DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
 
-MAIN_EXTRA_LIBS        = 
+MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
 LD_EXTRA_LIBS          = 
 LD_SHARED              = 
 TOP_EXTRA_LIBS         = 
 SUB_EXTRA_LIBS         = 
 
-MODULES               += 
-UNUSED_MODULES        +=  tcltk
-PROGRAMS              +=  netgen
-INSTALL_CAD_DIRS      += 
+MODULES               +=  tcltk
+UNUSED_MODULES        += 
+PROGRAMS              +=  tcltk
+INSTALL_CAD_DIRS      +=  tcltk
 
 RM                     = rm -f
 CP                     = cp
@@ -53,29 +53,29 @@ LINK		       = /bin/ld -r
 LD                     = /bin/ld
 M4		       = /bin/m4
 RANLIB                 = ranlib
-SHDLIB_EXT	       = 
-LDDL_FLAGS             = 
+SHDLIB_EXT	       = .so
+LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
 LD_RUN_PATH            = 
-LIB_SPECS              = 
-WISH_EXE	       = 
-TCL_LIB_DIR	       = 
+LIB_SPECS              =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+WISH_EXE	       = /usr/bin/wish
+TCL_LIB_DIR	       = /usr/lib
 
 CC                     = gcc
 CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\"\" -DNDEBUG
-CFLAGS                 = -g -m64 -fPIC  
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend
 DEPEND_FLAG            = -MM
 EXEEXT		       = 
 
 GR_CFLAGS              =  
-GR_DFLAGS              =  -DNDEBUG
-GR_LIBS                =  
-GR_SRCS                = 
+GR_DFLAGS              =  -DX11 -DXLIB -DNDEBUG
+GR_LIBS                =  -lX11 
+GR_SRCS                =  ${TK_SRCS}
 
 OBJS      = ${SRCS:.c=.o}
 LIB_OBJS  = ${LIB_SRCS:.c=.o}

install.log

@@ -666,3 +666,525 @@ rm -f /usr/local/lib/netgen/tcl/netgenexec
 cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man
+for dir in netgen netgen lib doc ; do \
+	(cd $dir && make install); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/bin/netcomp
+cp netcomp /usr/local/bin/netcomp
+rm -f /usr/local/bin/inetcomp
+cp inetcomp /usr/local/bin/inetcomp
+rm -f /usr/local/bin/ntk2adl
+cp ntk2adl /usr/local/bin/ntk2adl
+rm -f /usr/local/bin/ntk2xnf
+cp ntk2xnf /usr/local/bin/ntk2xnf
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Nothing to be done for 'install'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man
+for dir in netgen netgen lib doc ; do \
+	(cd $dir && make install); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Nothing to be done for 'install'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Nothing to be done for 'install'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'

scripts/config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by netgen configure 1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --without-tcl
+  $ ./configure 
 
 ## --------- ##
 ## Platform. ##
@@ -125,7 +125,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3382: result: gcc -E
@@ -146,7 +146,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
 configure:3445: checking for library containing strerror
@@ -261,7 +261,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -302,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -382,7 +382,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -454,7 +454,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "47"
+| #define NETGEN_REVISION "50"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -487,6 +487,14 @@ configure:4674: checking for __va_copy
 configure:4692: gcc -o conftest -g   conftest.c  >&5
 configure:4692: $? = 0
 configure:4701: result: yes
+configure:4831: checking for tclConfig.sh
+configure:4903: result: /usr/lib64/tclConfig.sh
+configure:4919: checking for tkConfig.sh
+configure:4992: result: /usr/lib64/tkConfig.sh
+configure:5106: checking for wish executable
+configure:5133: result: /usr/bin/wish
+configure:5139: checking for tclsh executable
+configure:5165: result: /usr/bin/tclsh
 configure:5288: checking for X
 configure:5427: gcc -o conftest -g   conftest.c -lX11  >&5
 configure:5427: $? = 0
@@ -608,32 +616,32 @@ ac_cv_target=x86_64-unknown-linux-gnu
 ## Output variables. ##
 ## ----------------- ##
 
-ALL_TARGET='standard'
+ALL_TARGET='tcl'
 CC='gcc'
 CFLAGS='-g -m64 -fPIC'
 CPP='gcc -E -x c'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
 ECHO_T=''
 EGREP='/bin/grep -E'
 EXEEXT=''
-EXTRA_LIB_SPECS=''
+EXTRA_LIB_SPECS='-ldl'
 GREP='/bin/grep'
 INC_SPECS=''
 INSTALL_DATA='${INSTALL} -m 644'
 INSTALL_PROGRAM='${INSTALL}'
 INSTALL_SCRIPT='${INSTALL}'
-INSTALL_TARGET='install-netgen'
+INSTALL_TARGET='install-tcl'
 LD='/bin/ld'
-LDDL_FLAGS=''
+LDDL_FLAGS=' -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map'
 LDFLAGS=''
 LD_RUN_PATH=''
 LIBOBJS=''
 LIBS=''
-LIB_SPECS=''
+LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
 LTLIBOBJS=''
 M4='/bin/m4'
 OBJEXT='o'
@@ -647,15 +655,15 @@ PACKAGE_VERSION='1.3'
 PATH_SEPARATOR=':'
 RANLIB='ranlib'
 SCRIPTS=''
-SHDLIB_EXT=''
+SHDLIB_EXT='.so'
 SHELL='/bin/sh'
-SHLIB_CFLAGS=''
+SHLIB_CFLAGS='-fPIC'
 SHLIB_LD=''
 SHLIB_LIB_SPECS=''
-TCLSH_EXE=''
-TCL_LIB_DIR=''
+TCLSH_EXE='/usr/bin/tclsh'
+TCL_LIB_DIR='/usr/lib'
 VERSION=''
-WISH_EXE=''
+WISH_EXE='/usr/bin/wish'
 XMKMF=''
 X_CFLAGS=''
 X_EXTRA_LIBS=''
@@ -668,18 +676,18 @@ build_alias=''
 build_cpu='x86_64'
 build_os='linux-gnu'
 build_vendor='unknown'
-cadinstall=''
+cadinstall=' tcltk'
 datadir='${datarootdir}'
 datarootdir='${prefix}/share'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 dvidir='${docdir}'
 exec_prefix='${prefix}'
-extra_defs=' -DCAD_DIR=\"${LIBDIR}\"'
-extra_libs=''
+extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"'
+extra_libs=' ${NETGENDIR}/tcltk/libtcltk.o'
 gr_cflags=''
-gr_dflags=''
-gr_libs=''
-gr_srcs=''
+gr_dflags=' -DX11 -DXLIB'
+gr_libs=' -lX11'
+gr_srcs=' ${TK_SRCS}'
 host='x86_64-unknown-linux-gnu'
 host_alias=''
 host_cpu='x86_64'
@@ -695,12 +703,12 @@ libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
 localstatedir='${prefix}/var'
 mandir='${datarootdir}/man'
-modules=''
+modules=' tcltk'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
 prefix='/usr/local'
 program_transform_name='s,x,x,'
-programs=' netgen'
+programs=' tcltk'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
@@ -712,7 +720,7 @@ target_cpu='x86_64'
 target_os='linux-gnu'
 target_vendor='unknown'
 top_extra_libs=''
-unused=' tcltk'
+unused=''
 
 ## ----------- ##
 ## confdefs.h. ##
@@ -726,7 +734,7 @@ unused=' tcltk'
 #define PACKAGE_BUGREPORT "[email protected]"
 #define PACKAGE_URL ""
 #define NETGEN_VERSION "1.5"
-#define NETGEN_REVISION "47"
+#define NETGEN_REVISION "50"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@@ -749,6 +757,7 @@ unused=' tcltk'
 #define HAVE_VA_COPY 1
 #define HAVE___VA_COPY 1
 #define DBUG_OFF 1
+#define TCL_NETGEN 1
 #define linux 1
 #define SYSV 1
 #define ISC 1

scripts/config.status

@@ -417,7 +417,7 @@ $config_files
 
 Report bugs to <[email protected]>."
 
-ac_cs_config="'--without-tcl' 'CFLAGS=-g'"
+ac_cs_config="'CFLAGS=-g'"
 ac_cs_version="\
 netgen config.status 1.3
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -496,7 +496,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--without-tcl' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -584,39 +584,39 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["INSTALL_TARGET"]="install-netgen"
-S["ALL_TARGET"]="standard"
+S["INSTALL_TARGET"]="install-tcl"
+S["ALL_TARGET"]="tcl"
 S["LD_RUN_PATH"]=""
-S["SHLIB_CFLAGS"]=""
+S["SHLIB_CFLAGS"]="-fPIC"
 S["DEPEND_FLAG"]="-MM"
-S["gr_srcs"]=""
-S["gr_libs"]=""
-S["gr_dflags"]=""
+S["gr_srcs"]=" ${TK_SRCS}"
+S["gr_libs"]=" -lX11"
+S["gr_dflags"]=" -DX11 -DXLIB"
 S["gr_cflags"]=""
-S["cadinstall"]=""
-S["programs"]=" netgen"
-S["unused"]=" tcltk"
-S["modules"]=""
+S["cadinstall"]=" tcltk"
+S["programs"]=" tcltk"
+S["unused"]=""
+S["modules"]=" tcltk"
 S["sub_extra_libs"]=""
 S["top_extra_libs"]=""
 S["ld_extra_objs"]=""
 S["ld_extra_libs"]=""
-S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\""
-S["extra_libs"]=""
+S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\" -DTCL_DIR=\\\"${TCLDIR}\\\""
+S["extra_libs"]=" ${NETGENDIR}/tcltk/libtcltk.o"
 S["SCRIPTS"]=""
 S["PACKAGE"]="netgen"
 S["VERSION"]=""
-S["TCL_LIB_DIR"]=""
-S["TCLSH_EXE"]=""
-S["WISH_EXE"]=""
-S["LIB_SPECS"]=""
+S["TCL_LIB_DIR"]="/usr/lib"
+S["TCLSH_EXE"]="/usr/bin/tclsh"
+S["WISH_EXE"]="/usr/bin/wish"
+S["LIB_SPECS"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
 S["INC_SPECS"]=""
-S["EXTRA_LIB_SPECS"]=""
+S["EXTRA_LIB_SPECS"]="-ldl"
 S["SHLIB_LIB_SPECS"]=""
-S["LDDL_FLAGS"]=""
+S["LDDL_FLAGS"]=" -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map"
 S["LD"]="/bin/ld"
 S["SHLIB_LD"]=""
-S["SHDLIB_EXT"]=""
+S["SHDLIB_EXT"]=".so"
 S["X_EXTRA_LIBS"]=""
 S["X_LIBS"]=""
 S["X_PRE_LIBS"]=" -lSM -lICE"
@@ -657,10 +657,10 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
-"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"47\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"50\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
 "DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\
 "SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\
-"VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1"
+"VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"

scripts/defs.mak

@@ -24,8 +24,8 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL}
 
 # Override standard "make" target when compiling under TCL
-ALL_TARGET = standard
-INSTALL_TARGET = install-netgen
+ALL_TARGET = tcl
+INSTALL_TARGET = install-tcl
 
 # Change CADDIR to install in a different place
 BINDIR                 = ${bindir}
@@ -34,16 +34,16 @@ LIBDIR                 = ${libdir}
 DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
 
-MAIN_EXTRA_LIBS        = 
+MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
 LD_EXTRA_LIBS          = 
 LD_SHARED              = 
 TOP_EXTRA_LIBS         = 
 SUB_EXTRA_LIBS         = 
 
-MODULES               += 
-UNUSED_MODULES        +=  tcltk
-PROGRAMS              +=  netgen
-INSTALL_CAD_DIRS      += 
+MODULES               +=  tcltk
+UNUSED_MODULES        += 
+PROGRAMS              +=  tcltk
+INSTALL_CAD_DIRS      +=  tcltk
 
 RM                     = rm -f
 CP                     = cp
@@ -53,29 +53,29 @@ LINK		       = /bin/ld -r
 LD                     = /bin/ld
 M4		       = /bin/m4
 RANLIB                 = ranlib
-SHDLIB_EXT	       = 
-LDDL_FLAGS             = 
+SHDLIB_EXT	       = .so
+LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
 LD_RUN_PATH            = 
-LIB_SPECS              = 
-WISH_EXE	       = 
-TCL_LIB_DIR	       = 
+LIB_SPECS              =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+WISH_EXE	       = /usr/bin/wish
+TCL_LIB_DIR	       = /usr/lib
 
 CC                     = gcc
 CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\"\" -DNDEBUG
-CFLAGS                 = -g -m64 -fPIC  
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend
 DEPEND_FLAG            = -MM
 EXEEXT		       = 
 
 GR_CFLAGS              =  
-GR_DFLAGS              =  -DNDEBUG
-GR_LIBS                =  
-GR_SRCS                = 
+GR_DFLAGS              =  -DX11 -DXLIB -DNDEBUG
+GR_LIBS                =  -lX11 
+GR_SRCS                =  ${TK_SRCS}
 
 OBJS      = ${SRCS:.c=.o}
 LIB_OBJS  = ${LIB_SRCS:.c=.o}