X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2Ftest%2FMakefile;h=136b1d29c57783072d2e2c3a31ce77169dbe7534;hb=ef67d338c7f28ba041abe40ca9a8ab69f8365a90;hp=796b4248be497450074ffeb2eb1bc984cdf46e0d;hpb=7ea8c1e58b3ab98eda5b003ccdffe5e35222bb4f;p=valse.git

diff --git a/src/test/Makefile b/src/test/Makefile
index 796b424..136b1d2 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,39 +1,41 @@
 CC = gcc
 CFLAGS = -g -std=gnu99 -Wno-implicit-function-declaration
 LDFLAGS = -lm -lgsl -lcblas -lgomp
-LDFLAGS_TEST = -Lobj/ -lvalse_core
-LIB = valse_core.so
+TEST_LDFLAGS = -L. libvalse_core.so
+LIB = libvalse_core.so
 LIB_SRC = $(wildcard ../sources/*.c)
 LIB_OBJ = $(LIB_SRC:.c=.o)
 INCLUDES = -I../sources
+TESTS = test.EMGLLF test.EMGrank test.constructionModelesLassoMLE test.EMGrank\
+        test.constructionModelesLassoRank test.selectionTotale
 
-all: $(LIB) test.EMGLLF test.EMGrank test.constructionModelesLassoMLE test.EMGrank test.constructionModelesLassoRank test.selectionTotale
+all: $(LIB) $(TESTS)
 
 $(LIB): $(LIB_OBJ)
 	$(CC) -shared -o $@ $^ $(LDFLAGS)
 
-test.EMGLLF: test.EMGLLF.o
+test.EMGLLF: $(LIB) test.EMGLLF.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
-test.constructionModelesLassoMLE: test.constructionModelesLassoMLE.o
+test.EMGrank: $(LIB) test.EMGrank.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
-test.EMGrank: test.EMGrank.o
+test.constructionModelesLassoMLE: $(LIB) test.constructionModelesLassoMLE.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
-test.constructionModelesLassoRank: test.constructionModelesLassoRank.o
+test.constructionModelesLassoRank: $(LIB) test.constructionModelesLassoRank.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
-test.selectionTotale: test.selectionTotale.o
+test.selectionTotale: $(LIB) test.selectionTotale.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
 %.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGS) $(INCLUDES)
+	$(CC) -fPIC -o $@ -c $< $(CFLAGS) $(INCLUDES)
 
 clean:
 	rm -f *.o ../sources/*.o
 
 cclean: clean
-	rm -f $(LIB) $(TEST)
+	rm -f $(LIB) $(TESTS)
 
 .PHONY: all clean cclean