Bump version to 1.1.0; Update ChangeLog.

[sort-networks.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d433065..8dc2c4d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,17 +5,17 @@ lib_LTLIBRARIES = libsortnetwork.la
 bin_PROGRAMS = sn-apply \
               sn-bitonicmerge sn-bitonicsort \
               sn-bb sn-bb-merge sn-check-bf \
-              sn-count-cuts sn-cut \
+              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-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_hashtable.c sn_hashtable.h
-libsortnetwork_la_LDFLAGS = -version-info 0:0:0
+libsortnetwork_la_LDFLAGS = -version-info 1:0:1
 
 sn_apply_SOURCES = sn-apply.c
 sn_apply_LDADD = libsortnetwork.la
@@ -39,13 +39,18 @@ 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
+sn_markov_SOURCES = sn-markov.c \
+                   histogram.c histogram.h
 sn_markov_LDADD = libsortnetwork.la
 
 sn_merge_SOURCES = sn-merge.c
@@ -78,6 +83,9 @@ 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 sn-evolution-merge