X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=60ba4168540ab63195e45124cdadeb2bd8cead84;hb=34df36ee7b8cd1aef2d1a022700e329fcc1bd541;hp=773906f531d2966e9148f927467181291174d2cd;hpb=a0693de016d176c60b9a8c8c377219f7b81fbc60;p=sort-networks.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 773906f..60ba416 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ include_HEADERS = sn_network.h sn_stage.h sn_comparator.h
 
 lib_LTLIBRARIES = libsortnetwork.la
 
-bin_PROGRAMS = sn-apply sn-batcher sn-check-bf sn-cut sn-merge sn-normalize \
-	       sn-oddevenmerge sn-shmoo sn-show sn-tex
+bin_PROGRAMS = sn-apply sn-batcher sn-bb sn-bb-merge sn-check-bf sn-cut sn-info sn-merge \
+	       sn-normalize sn-oddevenmerge sn-shmoo sn-show sn-svg sn-tex
 
 libsortnetwork_la_SOURCES = sn_network.c sn_network.h       \
 			    sn_stage.c sn_stage.h           \
@@ -17,12 +17,22 @@ sn_apply_LDADD = libsortnetwork.la
 sn_batcher_SOURCES = sn-batcher.c
 sn_batcher_LDADD = libsortnetwork.la
 
+sn_bb_SOURCES = sn-bb.c
+sn_bb_LDADD = libsortnetwork.la -lm
+
+sn_bb_merge_SOURCES = sn-bb.c
+sn_bb_merge_CPPFLAGS = $(AM_CPPFLAGS) -DBUILD_MERGE=1
+sn_bb_merge_LDADD = libsortnetwork.la -lm
+
 sn_check_bf_SOURCES = sn-check-bf.c
 sn_check_bf_LDADD = libsortnetwork.la
 
 sn_cut_SOURCES = sn-cut.c
 sn_cut_LDADD = libsortnetwork.la
 
+sn_info_SOURCES = sn-info.c
+sn_info_LDADD = libsortnetwork.la
+
 sn_merge_SOURCES = sn-merge.c
 sn_merge_LDADD = libsortnetwork.la
 
@@ -38,19 +48,32 @@ sn_shmoo_LDADD = libsortnetwork.la
 sn_show_SOURCES = sn-show.c
 sn_show_LDADD = libsortnetwork.la
 
+sn_svg_SOURCES = sn-svg.c
+sn_svg_LDADD = libsortnetwork.la
+
 sn_tex_SOURCES = sn-tex.c
 sn_tex_LDADD = libsortnetwork.la
 
 if BUILD_WITH_LIBPOPULATION
-bin_PROGRAMS += sn-evolution sn-evolution-cut
+bin_PROGRAMS += sn-evolution sn-evolution2 sn-evolution-cut sn-evolution-merge
 
 sn_evolution_SOURCES = sn-evolution.c
 sn_evolution_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPOPULATION_CPPFLAGS)
 sn_evolution_LDFLAGS = $(AM_LDFLAGS) $(LIBPOPULATION_LDFLAGS)
 sn_evolution_LDADD = libsortnetwork.la $(LIBPOPULATION_LIBS)
 
+sn_evolution2_SOURCES = sn-evolution2.c
+sn_evolution2_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPOPULATION_CPPFLAGS)
+sn_evolution2_LDFLAGS = $(AM_LDFLAGS) $(LIBPOPULATION_LDFLAGS)
+sn_evolution2_LDADD = libsortnetwork.la $(LIBPOPULATION_LIBS)
+
 sn_evolution_cut_SOURCES = sn-evolution-cut.c
 sn_evolution_cut_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPOPULATION_CPPFLAGS)
 sn_evolution_cut_LDFLAGS = $(AM_LDFLAGS) $(LIBPOPULATION_LDFLAGS)
 sn_evolution_cut_LDADD = libsortnetwork.la $(LIBPOPULATION_LIBS)
+
+sn_evolution_merge_SOURCES = sn-evolution-merge.c
+sn_evolution_merge_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPOPULATION_CPPFLAGS)
+sn_evolution_merge_LDFLAGS = $(AM_LDFLAGS) $(LIBPOPULATION_LDFLAGS)
+sn_evolution_merge_LDADD = libsortnetwork.la $(LIBPOPULATION_LIBS)
 endif