Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 24861)
+++ trunk/scconfig/Rev.h	(revision 24862)
@@ -1 +1 @@
-static const int myrev = 24861;
+static const int myrev = 24862;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 24861)
+++ trunk/scconfig/Rev.tab	(revision 24862)
@@ -1,4 +1,4 @@
-24861	configure	code simplification: merge hid_flags.[ch] into lib_hid_common
+24862	configure	code simplification: merge hid_flags.[ch] into lib_hid_common
 24824	configure	move window placement from dialogs to lib_hid_commonfor hidlib cleanup
 24816	configure	safety wrapper around unlink, opendir, closedir and readdir
 24736	configure	make distclean fixes to really remove all generated files
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 24861)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 24862)
@@ -13,12 +13,10 @@
 
 if ?libs/script/fungw/presents
 then
-	print {HASHOBJ=\n}
-	print {FUNGWOBJ=}
+	print {HASHOBJ=}
 else
 # no system installed fungw: need local hash objects
-	print {HASHOBJ=../../src_3rd//genht/hash.o ../../src_3rd//genht/htsp.o ../../src_3rd//genht/htpp.o ../../src_3rd//genht/htsi.o ../../src_3rd//genht/htpi.o\n}
-	print {FUNGWOBJ=../../src_3rd/libfungw/fungw.o ../../src_3rd/libfungw/fungw_conv.o ../../src_3rd/libfungw/fungw_ptr.o ../../src_3rd/libfungw/fungw_debug.o ../../src_3rd/libfungw/fungw_call.o}
+	print {HASHOBJ=../../src_3rd//genht/hash.o ../../src_3rd//genht/htsp.o ../../src_3rd//genht/htpp.o ../../src_3rd//genht/htsi.o}
 end
 
 print [@
@@ -57,7 +55,7 @@
 print [@
 
 FP_OBJS    = @/local/pcb/OBJS@ ../../src/plug_footprint.o
-CONF_OBJS  = ../../src/funchash.o ../../src/actions.o ../../src/vtlibrary.o ../../src/compat_fs.o ../../src/paths.o ../../src/conf.o ../../src/conf_core.o ../../src/hid_cfg.o ../../src/misc_util.o ../../src/unit.o ../../src/conf_internal.o ../../src/list_conf.o ../../src/conf_hid.o ../../src/pcb-printf.o ../../src/compat_misc.o ../../src/safe_fs.o
+CONF_OBJS  = ../../src/vtlibrary.o ../../src/compat_fs.o ../../src/paths.o ../../src/conf.o ../../src/conf_core.o ../../src/hid_cfg.o ../../src/misc_util.o ../../src/unit.o ../../src/conf_internal.o ../../src/list_conf.o ../../src/conf_hid.o ../../src/pcb-printf.o ../../src/compat_misc.o ../../src/safe_fs.o
 FP_LDFLAGS = @/local/pcb/LDFLAGS@
 FP_CFLAGS  = @/local/pcb/CFLAGS@
 OBJS = \
@@ -75,8 +73,8 @@
 revcheck:
 	cd ../../scconfig && ./revtest Rev.stamp < Rev.tab
 
-gsch2pcb-rnd$(EXE): $(OBJS)  $(CONF_OBJS) $(HASHOBJ) $(FUNGWOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(FP_OBJS) $(LHTOBJ)
-	$(CC) $(OBJS) $(CONF_OBJS)  $(FP_OBJS) $(HASHOBJ) $(FUNGWOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(LHTOBJ) -o gsch2pcb-rnd$(EXE) $(LDFLAGS) $(FP_LDFLAGS)
+gsch2pcb-rnd$(EXE): $(OBJS)  $(CONF_OBJS) $(HASHOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(FP_OBJS) $(LHTOBJ)
+	$(CC) $(OBJS) $(CONF_OBJS)  $(FP_OBJS) $(HASHOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(LHTOBJ) -o gsch2pcb-rnd$(EXE) $(LDFLAGS) $(FP_LDFLAGS)
 
 gsch2pcb.o: gsch2pcb.c ../../config.h
 	$(CC) -c $(CFLAGS) $(FP_CFLAGS) gsch2pcb.c -o gsch2pcb.o
@@ -83,7 +81,7 @@
 
 # TODO: this should be the base lib only
 # run the Makefile in src for the common objects:
-$(HASHOBJ) $(FUNGWOBJ) $(QPARSE) $(LHTOBJ) \
+$(HASHOBJ) $(QPARSE) $(LHTOBJ) \
 ../../src_3rd/genvector/gds_char.o ../../src_3rd/genvector/vtp0.o \
 ../../src_3rd/genvector/vts0.o ../../src_3rd/genadlist/genlist.o \
 ../../src_3rd/genlist/genlistalloc.o: