X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2FMakefile;h=0c422065cc9fe9f866cb41021e4117ac13a82d6c;hp=26d9bc6205d8fbb15f00322a3cba8e116a21a183;hb=bb64f5cbaa3f0d4cc49a0325ca24d4f41f90ccc3;hpb=f33f35efc9a01f93bb61959522d90ee6a76b892e

diff --git a/test/Makefile b/test/Makefile
index 26d9bc6..0c42206 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,13 +1,12 @@
 CC = gcc
 CFLAGS = -g -std=gnu99 -Wno-implicit-function-declaration
-LDFLAGS = -lm -lgsl -lcblas -lgomp
+LDFLAGS = -lm -lgsl -lcblas
 TEST_LDFLAGS = -L. libvalse_core.so
 LIB = libvalse_core.so
-LIB_SRC = $(wildcard ../sources/*.c)
+LIB_SRC = ../pkg/src/EMGLLF.c ../pkg/src/EMGrank.c
 LIB_OBJ = $(LIB_SRC:.c=.o)
-INCLUDES = -I../sources
-TESTS = test.EMGLLF test.EMGrank test.constructionModelesLassoMLE test.EMGrank\
-        test.constructionModelesLassoRank test.selectionTotale
+INCLUDES = -I../pkg/src
+TESTS = test.EMGLLF test.EMGrank
 
 all: $(LIB) $(TESTS)
 
@@ -20,22 +19,13 @@ test.EMGLLF: $(LIB) test.EMGLLF.o test_utils.o
 test.EMGrank: $(LIB) test.EMGrank.o test_utils.o
 	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
 
-test.constructionModelesLassoMLE: $(LIB) test.constructionModelesLassoMLE.o test_utils.o
-	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
-
-test.constructionModelesLassoRank: $(LIB) test.constructionModelesLassoRank.o test_utils.o
-	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
-
-test.selectionTotale: $(LIB) test.selectionTotale.o test_utils.o
-	$(CC) -o $@ $^ $(LDFLAGS) $(TEST_LDFLAGS)
-
 %.o: %.c
 	$(CC) -fPIC -o $@ -c $< $(CFLAGS) $(INCLUDES)
 
 clean:
-	rm -f *.o ../sources/*.o ../adapters/*.o
+	rm -f *.o ../pkg/src/*.o
 
 cclean: clean
-	rm -f *.so $(TESTS)
+	rm -f *.so ../pkg/src/*.so $(TESTS)
 
 .PHONY: all clean cclean