X-Git-Url: https://git.octo.it/?p=sort-networks.git;a=blobdiff_plain;f=src%2FMakefile.am;h=c14c1880d831ff1d10b0378b334ceebe71890b71;hp=7612c97e51d1a686d4468513939fc2d960cd747c;hb=7f5611eaa2e099c4422c49a8c47fd437b291dfb4;hpb=83e45cbde13aca5f1be11ee50e6f07f5140f213d

diff --git a/src/Makefile.am b/src/Makefile.am
index 7612c97..c14c188 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,30 +2,57 @@ 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-info sn-merge \
-	       sn-normalize sn-oddevenmerge sn-shmoo sn-show sn-tex
+bin_PROGRAMS = sn-apply \
+	       sn-bitonicmerge sn-bitonicsort \
+	       sn-bb sn-bb-merge sn-check-bf \
+	       sn-count-cuts sn-count-markov sn-cut \
+	       sn-info sn-markov sn-merge sn-normalize \
+	       sn-oddevenmerge sn-oddevensort sn-pairwisesort \
+	       sn-shmoo sn-show sn-svg sn-tex sn-tex-cut sn-transpositionsort
 
 libsortnetwork_la_SOURCES = sn_network.c sn_network.h       \
 			    sn_stage.c sn_stage.h           \
 			    sn_comparator.c sn_comparator.h \
-			    sn_random.c sn_random.h
+			    sn_random.c sn_random.h \
+			    sn_hashtable.c sn_hashtable.h
 libsortnetwork_la_LDFLAGS = -version-info 0:0:0
 
 sn_apply_SOURCES = sn-apply.c
 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_bitonicmerge_SOURCES = sn-bitonicmerge.c
+sn_bitonicmerge_LDADD = libsortnetwork.la
+
+sn_bitonicsort_SOURCES = sn-bitonicsort.c
+sn_bitonicsort_LDADD = libsortnetwork.la
 
 sn_check_bf_SOURCES = sn-check-bf.c
 sn_check_bf_LDADD = libsortnetwork.la
 
+sn_count_cuts_SOURCES = sn-count-cuts.c
+sn_count_cuts_LDADD = libsortnetwork.la -lm
+
+sn_count_markov_SOURCES = sn-count-markov.c
+sn_count_markov_CFLAGS = $(AM_CFLAGS) $(glib_CFLAGS)
+sn_count_markov_LDADD = libsortnetwork.la $(glib_LIBS)
+
 sn_cut_SOURCES = sn-cut.c
 sn_cut_LDADD = libsortnetwork.la
 
 sn_info_SOURCES = sn-info.c
 sn_info_LDADD = libsortnetwork.la
 
+sn_markov_SOURCES = sn-markov.c \
+		    histogram.c histogram.h
+sn_markov_LDADD = libsortnetwork.la
+
 sn_merge_SOURCES = sn-merge.c
 sn_merge_LDADD = libsortnetwork.la
 
@@ -35,17 +62,32 @@ sn_normalize_LDADD = libsortnetwork.la
 sn_oddevenmerge_SOURCES = sn-oddevenmerge.c
 sn_oddevenmerge_LDADD = libsortnetwork.la
 
+sn_oddevensort_SOURCES = sn-oddevensort.c
+sn_oddevensort_LDADD = libsortnetwork.la
+
+sn_pairwisesort_SOURCES = sn-pairwisesort.c
+sn_pairwisesort_LDADD = libsortnetwork.la
+
 sn_shmoo_SOURCES = sn-shmoo.c
 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
 
+sn_tex_cut_SOURCES = sn-tex-cut.c
+sn_tex_cut_LDADD = libsortnetwork.la
+
+sn_transpositionsort_SOURCES = sn-transpositionsort.c
+sn_transpositionsort_LDADD = libsortnetwork.la
+
 if BUILD_WITH_LIBPOPULATION
-bin_PROGRAMS += sn-evolution sn-evolution2 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)
@@ -61,4 +103,9 @@ 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