Index: trunk/tests/conf/Makefile
===================================================================
--- trunk/tests/conf/Makefile	(revision 34378)
+++ trunk/tests/conf/Makefile	(revision 34379)
@@ -1,15 +1,14 @@
 ROOT=../..
 include $(ROOT)/Makefile.conf
+include $(ROOT)/src/librnd/core/librnd.mak
 
-include $(LIBRND_MAK)
-
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(ROOT)/src -I$(ROOT)/src_3rd $(CFLAGS_LIBRND_FUNGW) $(CFLAGS_LIBRND)
 LDLIBS = -lm $(LDFLAGS_LIBRND_FUNGW) $(LDFLAGS_LIBRND)
 
-LIB_HIDLIB=-lrnd-hid -lrnd-3rd
+HELPER_OBJS=conf_core.o
+LIBRND_OBJS= \
+ $(ROOT)/src/librnd-hid.a $(ROOT)/src/librnd-3rd.a
 
-HELPER_OBJS= conf_core.o
-
 DEPH = \
 	$(ROOT)/src/librnd/core/conf.h \
 	$(ROOT)/src/librnd/core/conf_hid.h \
@@ -20,8 +19,8 @@
 
 all: conftest
 
-conftest: $(OBJS) $(HELPER_OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) $(HELPER_OBJS) $(LIB_HIDLIB) $(LDLIBS) -o conftest
+conftest: $(OBJS) $(HELPER_OBJS) $(LIBRND_OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) $(HELPER_OBJS) $(LIBRND_OBJS) $(LDLIBS) -o conftest
 
 conftest.o: conftest.c $(DEPH)
 	$(CC) $(CFLAGS) -c conftest.c -o conftest.o
@@ -28,7 +27,7 @@
 
 help.o: help.c
 
-$(LIB_HIDLIB):
+$(LIBRND_OBJS):
 	cd ../../src && make
 
 test: