X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2FMakefile;h=135e30e9dfba5d6f654c94c80553def815f18526;hb=79789cfc25a65312d8b91000abc7eb9209322555;hp=400a2fc9a11b289acf8b388852676b0745da2fbd;hpb=46a645f7e7da30581d97f69c02e3cb5c5adcd716;p=sort-networks.git

diff --git a/src/Makefile b/src/Makefile
index 400a2fc..135e30e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,17 +1,26 @@
 CC = gcc
-#CFLAGS = -Wall -Werror -std=c99 -O3
-CFLAGS = -Wall -Werror -std=c99 -O0 -g
+CFLAGS = -Wall -Werror -std=c99 -O3 -pthread
+#CFLAGS = -Wall -Werror -std=c99 -O0 -g -pthread
 
-all: sn-cut sn-evolution sn-merge sn-show
+APPLICATIONS = sn-apply sn-batcher sn-check-bf sn-cut sn-cut-loop \
+	       sn-evolution sn-find-9 sn-merge \
+	       sn-normalize sn-oddevenmerge sn-show sn-tex
+
+POPULATION_CFLAGS = -I/tmp/sifnfors/libpopulation/include
+
+POPULATION_LDFLAGS = -L/tmp/sifnfors/libpopulation/lib -Wl,--rpath -Wl,/tmp/sifnfors/libpopulation/lib -lpopulation
+
+all: $(APPLICATIONS)
 
 clean:
 	rm -f *.o
-	rm -f sn-cut sn-evolution sn-merge sn-show
+	rm -f $(APPLICATIONS)
 
 sn_comparator.o: sn_comparator.c sn_comparator.h
 
-sn_network.o: sn_network.c sn_network.h sn_stage.h sn_comparator.h
+sn_network.o: sn_network.c sn_network.h sn_stage.h sn_comparator.h sn_random.h
 
+sn_population.o: CFLAGS = $(POPULATION_CFLAGS)
 sn_population.o: sn_population.c sn_population.h sn_network.h sn_random.h
 
 sn_random.o: sn_random.c sn_random.h
@@ -19,13 +28,25 @@ sn_random.o: sn_random.c sn_random.h
 sn_stage.o: sn_stage.c sn_stage.h sn_comparator.h
 
 
-sn-cut: sn-cut.c sn_network.o sn_stage.o sn_comparator.o
+sn-apply: sn-apply.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
+sn-check-bf: sn-check-bf.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
 
+sn-cut: sn-cut.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
+sn-evolution: CFLAGS += $(POPULATION_CFLAGS)
+sn-evolution: LDFLAGS += $(POPULATION_LDFLAGS)
 sn-evolution: sn-evolution.c sn_network.o sn_stage.o sn_comparator.o sn_population.o sn_random.o
 
-sn-merge: sn-merge.c sn_network.o sn_stage.o sn_comparator.o
+sn-merge: sn-merge.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
+sn-normalize: sn-normalize.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
+sn-oddevenmerge: sn-oddevenmerge.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
+sn-show: sn-show.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
 
-sn-show: sn-show.c sn_network.o sn_stage.o sn_comparator.o
+sn-tex: sn-tex.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
 
 .PHONY: clean