reorg fixup

diff --git a/socket-sniff/Makefile b/socket-sniff/Makefile
index e86108ff4d63e5ee2055620aee326e8a07f191b8..988819577caad1fcae5665d55e5fb5c8ed0e022f 100644 (file)
--- a/socket-sniff/Makefile
+++ b/socket-sniff/Makefile
@@ -1,11 +1,12 @@
 default: socket-sniff
 
-RRQLIBS = typing vector
+RRQLIBS = vector typing
 INCDIRS = $(addprefix -I../,$(RRQLIBS))
+$(foreach L,$(RRQLIBS),$(eval LDLIBS += -L../$L -lrrq$L))
 
 CFLAGS = -Wall $(INCDIRS)
 CFLAGS += -g -fmax-errors=1
-LDLIBS = -L../vector -lvector -lm
+LDLIBS += -lm
 
 .INTERMEDIATE: socket-sniff.o
 

diff --git a/tests/Makefile b/tests/Makefile
index ab5fcc2811b59aa9886124acf6449e0a17cfce49..aa2f5eb4a54ea491d4bec66145a19f6cdfa5ca75 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,12 +4,13 @@ BIN = ${SRC:.c=}
 
 default: ${BIN}
 
-RRQLIBS = typing vector logic
+RRQLIBS = logic vector typing
 INCDIRS = $(addprefix -I../,$(RRQLIBS))
+$(foreach L,$(RRQLIBS),$(eval LDLIBS += -L../$L -lrrq$L))
 
 CFLAGS = -Wall $(INCDIRS)
 CFLAGS += -g -fmax-errors=1
-LDLIBS = -L../vector -lvector -lm
+LDLIBS += -lm
 
 .INTERMEDIATE: ${OBJ}