Index: trunk/tests/librnd/Makefile
===================================================================
--- trunk/tests/librnd/Makefile	(revision 34363)
+++ trunk/tests/librnd/Makefile	(revision 34364)
@@ -4,9 +4,10 @@
 include $(TRUNK)/Makefile.conf
 include $(TRUNK)/src/librnd/core/librnd.mak
 
+
 CFLAGS =  -I$(LIBRND_ROOT)/include -I$(LIBRND_ROOT)/include/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND)
 LDFLAGS = $(LIBRND_RDYNAMIC) $(LDFLAGS_LIBRND)
-LIBRND = include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-3rd.a
+LIBRND_A = include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-3rd.a
 
 all: librnd_test librnd_includes
 
@@ -14,14 +15,23 @@
 	./librnd_test --gui batch
 	./librnd_includes
 
-librnd_test: librnd_test.o $(LIBRND)
-	$(CC) -o librnd_test librnd_test.o $(LIBRND) $(LDFLAGS)
+librnd_objs: $(LIBRND_A)
+	-mkdir obj obj/poly obj/hid obj/3rd
+	-rm obj/poly/*.o obj/hid/*.o obj/3rd/*.o
+	cd obj/hid &&  ar x ../../include/$(HL_LIBDIR)/librnd-hid.a
+	cd obj/poly && ar x ../../include/$(HL_LIBDIR)/librnd-poly.a
+	cd obj/3rd &&  ar x ../../include/$(HL_LIBDIR)/librnd-3rd.a  
 
+
+librnd_test: librnd_test.o librnd_objs
+	$(CC) -o librnd_test librnd_test.o obj/hid/*.o obj/poly/*.o  obj/3rd/*.o $(LDFLAGS)
+
+
 librnd_test.o: librnd_test.c includes
 	$(CC) $(CFLAGS) -c -o librnd_test.o librnd_test.c
 
-librnd_includes: librnd_includes.o $(LIBRND)
-	$(CC) -o librnd_includes librnd_includes.o $(LIBRND) $(LDFLAGS)
+librnd_includes: librnd_includes.o librnd_objs
+	$(CC) -o librnd_includes librnd_includes.o  obj/hid/*.o obj/poly/*.o  obj/3rd/*.o $(LDFLAGS)
 
 librd_includes.o: librnd_includes.c includes
 
@@ -31,4 +41,4 @@
 clean:
 	-rm librnd_test librnd_test.o librnd_includes librnd_includes.o inc_all.h
 	-TDIR=`pwd` && cd ../../src && $(MAKE) uninstall HOW="uninstall -f" DESTDIR=$$TDIR/include PREFIX=
-	-rm -rf include/usr
+	-rm -rf include/usr obj