X-Git-Url: https://ruderich.org/simon/gitweb/?p=nsscash%2Fnsscash.git;a=blobdiff_plain;f=nss%2FMakefile;h=7dfe54738cf998245b2ca8ab5c61769e715dacff;hp=bbc43ee4f35c4c57e3da632b26ea323af0f5daa3;hb=1c8b03162112d713f693d91cfd14b11dae5a0a51;hpb=b84cf93cb9fc399366212fd1aa4c3b8faf18575c

diff --git a/nss/Makefile b/nss/Makefile
index bbc43ee..7dfe547 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -13,10 +13,10 @@ all: libnss_cash.so.2
 
 clean:
 	rm -f libnss_cash.so.2 \
-	    libcash_test.so tests/gr tests/pw \
+	    tests/libcash_test.so tests/gr tests/pw \
 	    tests/group.nsscash tests/passwd.nsscash
 
-libnss_cash.so.2 libcash_test.so: $(wildcard *.c) $(wildcard *.h)
+libnss_cash.so.2 tests/libcash_test.so: $(wildcard *.c) $(wildcard *.h)
 	$(CC) -o $@ -shared -fPIC -Wl,-soname,$@ \
 		$(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
 		file.c gr.c pw.c search.c \
@@ -26,12 +26,12 @@ libnss_cash.so.2 libcash_test.so: $(wildcard *.c) $(wildcard *.h)
 # Tests
 
 test: tests/gr tests/pw tests/group.nsscash tests/passwd.nsscash
-	LD_LIBRARY_PATH=. LD_PRELOAD= ./tests/gr
-	LD_LIBRARY_PATH=. LD_PRELOAD= ./tests/pw
+	LD_LIBRARY_PATH=./tests LD_PRELOAD= ./tests/gr
+	LD_LIBRARY_PATH=./tests LD_PRELOAD= ./tests/pw
 
-tests/%: tests/%.c libcash_test.so
+tests/%: tests/%.c tests/libcash_test.so
 	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
-		$(TEST_CFLAGS) $(TEST_LDFLAGS) -L. \
+		$(TEST_CFLAGS) $(TEST_LDFLAGS) -Ltests \
 		$< $(LDLIBS) -lcash_test -lasan
 
 tests/passwd.nsscash: tests/passwd
@@ -39,9 +39,9 @@ tests/passwd.nsscash: tests/passwd
 tests/group.nsscash: tests/group
 	../nsscash convert group $< $@
 
-libcash_test.so: CFLAGS += $(TEST_CFLAGS)
-libcash_test.so: CPPFLAGS += -DNSSCASH_GROUP_FILE='"./tests/group.nsscash"' \
-                             -DNSSCASH_PASSWD_FILE='"./tests/passwd.nsscash"'
-libcash_test.so: LDFLAGS += $(TEST_LDFLAGS)
+tests/libcash_test.so: CFLAGS += $(TEST_CFLAGS)
+tests/libcash_test.so: CPPFLAGS += -DNSSCASH_GROUP_FILE='"./tests/group.nsscash"' \
+                                   -DNSSCASH_PASSWD_FILE='"./tests/passwd.nsscash"'
+tests/libcash_test.so: LDFLAGS += $(TEST_LDFLAGS)
 
 .PHONY: all clean test