Index: trunk/tests/drc_query/Makefile
===================================================================
--- trunk/tests/drc_query/Makefile	(revision 34790)
+++ trunk/tests/drc_query/Makefile	(revision 34791)
@@ -10,10 +10,6 @@
 thickness.diff overlap.diff netint.diff dwg_area.diff fullpoly.diff \
 zone_clr.diff
 
-#TODO: remove this once librnd separation id finished
-LDLIB=export LD_LIBRARY_PATH=`pwd`/$(ROOT)/src_3rd/librnd-local/src &&
-
-
 test: $(TESTS)
 
 all:
@@ -22,37 +18,37 @@
 	@diff -u thickness.ref thickness.out && rm thickness.out
 
 thickness.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(FLT) > $(TDIR)/thickness.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(FLT) > $(TDIR)/thickness.out
 
 overlap.diff: overlap.out
 	@diff -u overlap.ref overlap.out && rm overlap.out
 
 overlap.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(FLT) > $(TDIR)/overlap.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(FLT) > $(TDIR)/overlap.out
 
 netint.diff: netint.out
 	@diff -u netint.ref netint.out && rm netint.out
 
 netint.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(FLT) > $(TDIR)/netint.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(FLT) > $(TDIR)/netint.out
 
 dwg_area.diff: dwg_area.out
 	@diff -u dwg_area.ref dwg_area.out && rm dwg_area.out
 
 dwg_area.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(FLT) > $(TDIR)/dwg_area.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(FLT) > $(TDIR)/dwg_area.out
 
 fullpoly.diff: fullpoly.out
 	@diff -u fullpoly.ref fullpoly.out && rm fullpoly.out
 
 fullpoly.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(FLT) > $(TDIR)/fullpoly.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(FLT) > $(TDIR)/fullpoly.out
 
 zone_clr.diff: zone_clr.out
 	@diff -u zone_clr.ref zone_clr.out && rm zone_clr.out
 
 zone_clr.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(FLT) > $(TDIR)/zone_clr.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(FLT) > $(TDIR)/zone_clr.out
 
 clean:
 	@echo "a" > dummy.out
Index: trunk/tests/query/Makefile
===================================================================
--- trunk/tests/query/Makefile	(revision 34790)
+++ trunk/tests/query/Makefile	(revision 34791)
@@ -5,10 +5,6 @@
 PCBRND=./pcb-rnd
 GLOBARGS=-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1
 
-#TODO: remove this once librnd separation id finished
-LDLIB=export LD_LIBRARY_PATH=`pwd`/$(ROOT)/src_3rd/librnd-local/src &&
-
-
 TESTS = \
 	action.diff getconf.diff getconf2.diff
 
@@ -20,19 +16,19 @@
 	@diff -u action.ref action.out && rm action.out
 
 action.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/action.out
+	@cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/action.out
 
 getconf.diff: getconf.out
 	@diff -u getconf.ref getconf.out && rm getconf.out
 
 getconf.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf.out
+	@cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf.out
 
 getconf2.diff: getconf2.out
 	@diff -u getconf2.ref getconf2.out && rm getconf2.out
 
 getconf2.out: FORCE
-	@$(LDLIB) cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf2.out
+	@cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf2.out
 
 clean:
 	@echo "a" > dummy.out