src/sn-batcher.c: Add program to create batcher mergesort networks.

[sort-networks.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 135e30e..e68993e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,13 +2,13 @@ CC = gcc
 CFLAGS = -Wall -Werror -std=c99 -O3 -pthread
 #CFLAGS = -Wall -Werror -std=c99 -O0 -g -pthread
 
-APPLICATIONS = sn-apply sn-batcher sn-check-bf sn-cut sn-cut-loop \
-              sn-evolution sn-find-9 sn-merge \
+APPLICATIONS = sn-apply sn-batcher sn-check-bf sn-cut \
+              sn-evolution sn-evolution2 sn-find-9 sn-merge \
               sn-normalize sn-oddevenmerge sn-show sn-tex
 
-POPULATION_CFLAGS = -I/tmp/sifnfors/libpopulation/include
+POPULATION_CFLAGS = -I/tmp/libpopulation/include
 
-POPULATION_LDFLAGS = -L/tmp/sifnfors/libpopulation/lib -Wl,--rpath -Wl,/tmp/sifnfors/libpopulation/lib -lpopulation
+POPULATION_LDFLAGS = -L/tmp/libpopulation/lib -Wl,--rpath -Wl,/tmp/libpopulation/lib -lpopulation
 
 all: $(APPLICATIONS)
 
@@ -16,6 +16,8 @@ clean:
        rm -f *.o
        rm -f $(APPLICATIONS)
 
+sn-batcher: sn-batcher.c sn_network.o sn_stage.o sn_comparator.o sn_random.o
+
 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_random.h
@@ -38,6 +40,12 @@ 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-evolution2: CFLAGS += $(POPULATION_CFLAGS)
+sn-evolution2: LDFLAGS += $(POPULATION_LDFLAGS) -lm
+sn-evolution2: sn-evolution2.c sn_network.o sn_stage.o sn_comparator.o sn_population.o sn_random.o
+
+sn-find-9: sn-find-9.c sn_network.o sn_stage.o sn_comparator.o sn_random.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