Merge branch 'v3-cleanup' into v3.1.6-alex

[netatalk.git] / libatalk / Makefile.am

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index c932076cae5d9f24db8fb5bddf7af6b5aa826c30..7dcf204e50e5f6bc4a7bd1d6859a416724c1dfed 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -18,7 +18,7 @@
 #        current+1:0:0
 #
 
-VERSION_INFO = 5:0:0
+VERSION_INFO = 16:0:0
 
 # History:          VERSION_INFO
 #
@@ -32,8 +32,18 @@ VERSION_INFO = 5:0:0
 #   3.0.2           3:0:0
 #   3.0.3           4:0:0
 #   3.0.4           5:0:0
+#   3.0.5           6:0:0
+#   3.0.6           7:0:0
 
-SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
+#   3.1.0           12:0:0
+#   3.1.1           13:0:0
+#   3.1.2           14:0:0
+#   3.1.3           15:0:0
+#   3.1.4           16:0:0
+#   3.1.5           16:0:0
+#   3.1.6           16:0:0
+
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
@@ -43,7 +53,7 @@ libatalk_la_CFLAGS = \
        @PTHREAD_CFLAGS@
 
 libatalk_la_LIBADD  = \
-       @WRAP_LIBS@ @ACL_LIBS@ @PTHREAD_LIBS@ \
+       @WRAP_LIBS@ @ACL_LIBS@ @PTHREAD_LIBS@ @MYSQL_LIBS@ \
        acl/libacl.la \
        adouble/libadouble.la   \
        bstring/libbstring.la \
@@ -52,7 +62,6 @@ libatalk_la_LIBADD  = \
        dsi/libdsi.la           \
        iniparser/libiniparser.la \
        talloc/libtalloc.la       \
-       tdb/libtdb.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
@@ -66,13 +75,18 @@ libatalk_la_DEPENDENCIES = \
        dsi/libdsi.la           \
        talloc/libtalloc.la       \
        iniparser/libiniparser.la \
-       tdb/libtdb.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
 
 libatalk_la_LDFLAGS = -version-info $(VERSION_INFO)
 
+if USE_BUILTIN_TDB
+SUBDIRS += tdb
+libatalk_la_LIBADD += tdb/libtdb.la
+libatalk_la_DEPENDENCIES += tdb/libtdb.la
+endif
+
 if DEVELOPER
 all-local: .libs/libatalk.so
        @$(top_srcdir)/abigen.sh .libs/libatalk.so > libatalk.abi.tmp
@@ -100,4 +114,13 @@ EXTRA_DIST = \
        libatalk-3.0.1.abi \
        libatalk-3.0.2.abi \
        libatalk-3.0.3.abi \
-       libatalk-3.0.4.abi
+       libatalk-3.0.4.abi \
+       libatalk-3.0.5.abi \
+       libatalk-3.0.6.abi \
+       libatalk-3.1.0.abi \
+       libatalk-3.1.1.abi \
+       libatalk-3.1.2.abi \
+       libatalk-3.1.3.abi \
+       libatalk-3.1.4.abi \
+       libatalk-3.1.6.abi \
+       libatalk-3.1.5.abi