Index: trunk/src/librnd/core/librnd.mak.in
===================================================================
--- trunk/src/librnd/core/librnd.mak.in	(revision 35494)
+++ trunk/src/librnd/core/librnd.mak.in	(revision 35495)
@@ -58,9 +58,12 @@
 # where librnd plugins are installed (should be on puplug search path)
 LIBRND_PLUGDIR=$(LIBRND_LIBDIR)/plugins
 
-CFLAGS_LIBRND=@?/local/librnd/CFLAGS_HIDLIB_STATIC_@ -I$(LIBRND_INCDIR) -I$(LIBRND_INCDIR)/librnd/src_3rd @?/local/librnd/librnd_mak_extra_inc@
-LDFLAGS_LIBRND=@?/local/librnd/librnd_mak_extra_ldf@ @?/local/librnd/LDFLAGS_HIDLIB_STATIC_@
+CFLAGS_LIBRND_STATIC=@?/local/librnd/CFLAGS_HIDLIB_STATIC_@ -I$(LIBRND_INCDIR) -I$(LIBRND_INCDIR)/librnd/src_3rd @?/local/librnd/librnd_mak_extra_inc@
+LDFLAGS_LIBRND_STATIC=@?/local/librnd/librnd_mak_extra_ldf@ @?/local/librnd/LDFLAGS_HIDLIB_STATIC_@
 
+CFLAGS_LIBRND=-I$(LIBRND_INCDIR) -I$(LIBRND_INCDIR)/librnd/src_3rd @?/local/librnd/librnd_mak_extra_inc@
+LDFLAGS_LIBRND=@?/local/librnd/librnd_mak_extra_ldf@
+
 # build helper tools
 PUPLUG=$(LIBRND_LIBDIR)/puplug
 SPHASH=$(LIBRND_LIBDIR)/sphash
Index: trunk/tests/librnd/Makefile
===================================================================
--- trunk/tests/librnd/Makefile	(revision 35494)
+++ trunk/tests/librnd/Makefile	(revision 35495)
@@ -6,8 +6,8 @@
 include $(TRUNK)/src/librnd/core/librnd.mak
 
 
-CFLAGS =  -I$(LIBRND_ROOT)/include/librnd4 -I$(LIBRND_ROOT)/include/librnd4/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND)
-LDFLAGS = $(LIBRND_RDYNAMIC) $(LDFLAGS_LIBRND)
+CFLAGS =  -I$(LIBRND_ROOT)/include/librnd4 -I$(LIBRND_ROOT)/include/librnd4/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND_STATIC)
+LDFLAGS = $(LIBRND_RDYNAMIC) $(LDFLAGS_LIBRND_STATIC)
 LIBRND_A = include/$(HL_LIBDIR)/librnd-font.a include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-core.a include/$(HL_LIBDIR)/librnd-3rd.a
 
 all: librnd_test librnd_includes
Index: trunk/tests/rnd_printf/Makefile
===================================================================
--- trunk/tests/rnd_printf/Makefile	(revision 35494)
+++ trunk/tests/rnd_printf/Makefile	(revision 35495)
@@ -14,7 +14,7 @@
 LIBPCB_BASE=$(SRC)/librnd-hid.a $(SRC)/librnd-core.a $(SRC)/librnd-3rd.a
 
 include $(LIBRND)/core/librnd.mak
-LDFLAGS = $(LDFLAGS_LIBRND)
+LDFLAGS = $(LDFLAGS_LIBRND_STATIC)
 
 
 test: tester.diff