Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 33307)
+++ trunk/src/Makefile.in	(revision 33308)
@@ -294,8 +294,8 @@
 	$(HOSTCC) $(SPHASH_PATH)/sphash.c -o $(SPHASH)
 
 # needed by gsch2pcb-rnd
-../src_3rd/genlist/genadlist.o ../src_3rd/genlist/genlistalloc.o:
-	cd ../src_3rd/genlist && $(MAKE) GENLIST_CFLAGS="$(GENLIST_CFLAGS)" GENLIST_LDFLAGS="$(GENLIST_LDFLAGS)" CC=$(CC)
+../src_3rd/librnd-local/src_3rd/genlist/genadlist.o ../src_3rd/librnd-local/src_3rd/genlist/genlistalloc.o:
+	cd ../src_3rd/librnd-local/src_3rd/genlist && $(MAKE) GENLIST_CFLAGS="$(GENLIST_CFLAGS)" GENLIST_LDFLAGS="$(GENLIST_LDFLAGS)" CC=$(CC)
 
 buildin.c: $(PLUGDIR)/.builtin.pups $(PUPLUG)
 	cd $(PLUGDIR) && $(PUPLUG) buildin.c "-" < $(PLUGDIR)/.builtin.pups > $(ROOT)/src/buildin.c
@@ -373,7 +373,7 @@
 gen_font:
 	$(ROOT)/util/devhelpers/font2c.sh < default_font > font_internal.c
 
-util_deps: $(OBJS) $(OBJS_UTIL) ../src_3rd/genlist/genadlist.o ../src_3rd/genlist/genlistalloc.o
+util_deps: $(OBJS) $(OBJS_UTIL) ../src_3rd/librnd-local/src_3rd/genlist/genadlist.o ../src_3rd/librnd-local/src_3rd/genlist/genlistalloc.o
 
 FORCE:
 
@@ -430,7 +430,7 @@
 #gsub /local/pcb/HDRS_3RDLIB {../src_3rd/libulzw/libulzw_[^ ]*.h } {}
 #gsub /local/pcb/HDRS_3RDLIB {../src_3rd/libfungw/fungw_ptr.h ../src_3rd/libfungw/fungw_debug.h ../src_3rd/libfungw/fungw_call.h } {}
 #append /local/pcb/HDRS_3RDLIB {../src_3rd/genrtree/genrtree_api.h ../src_3rd/genrtree/genrtree_impl.h ../src_3rd/genrtree/genrtree_search.h ../src_3rd/genrtree/genrtree_delete.h ../src_3rd/genrtree/genrtree_debug.h }
-#append /local/pcb/HDRS_3RDLIB {../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gendlist.h }
+#append /local/pcb/HDRS_3RDLIB {../src_3rd/librnd-local/src_3rd/genlist/gentdlist_impl.h ../src_3rd/librnd-local/src_3rd/genlist/gentdlist_undef.h ../src_3rd/librnd-local/src_3rd/genlist/gendlist.h }
 #append /local/pcb/HDRS_3RDLIB {../src_3rd/libulzw/libulzw.h }
 
 # dynamic part of install_pcbrnd: hidlib headers
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 33307)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 33308)
@@ -16,8 +16,8 @@
 LDFLAGS=-lm @/local/pcb/LDFLAGS@ $(LDFLAGS_LIBRND_FUNGW)
 CC=@cc/cc@
 LIB_HIDLIB=\
-	$(ROOT)/src/librnd-hid.a \
-	$(ROOT)/src/librnd-3rd.a
+	$(ROOT)/src_3rd/librnd-local/src/librnd-hid.a \
+	$(ROOT)/src_3rd/librnd-local/src/librnd-3rd.a
 @]
 
 print [@
@@ -69,16 +69,15 @@
 # TODO: this should be the base lib only
 # run the Makefile in src for the common objects:
 $(HASHOBJ) $(QPARSE) \
-../../src_3rd/genvector/gds_char.o ../../src_3rd/genvector/vtp0.o \
-../../src_3rd/genvector/vts0.o ../../src_3rd/genadlist/genlist.o \
+../../src_3rd/librnd-local/src_3rd/genadlist/genlist.o \
 ../../src_3rd/librnd-local/src_3rd/genlist/genlistalloc.o:
 	cd ../../src && $(MAKE) util_deps
 
-$(ROOT)/src/librnd-hid.a:
-	cd $(ROOT)/src && make librnd-hid.a
+$(ROOT)/src_3rd/librnd-local/src/librnd-hid.a:
+	cd $(ROOT)/src_3rd/librnd-local && make librnd-hid.a
 
-$(ROOT)/src/librnd-3rd.a:
-	cd $(ROOT)/src && make librnd-3rd.a
+$(ROOT)/src_3rd/librnd-local/src/librnd-3rd.a:
+	cd $(ROOT)/src_3rd/librnd-local && make librnd-3rd.a
 
 ##### module rules begin #####
 @/local/pcb/RULES@