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 62f1af30c9f23d65c9d149831cf62607d9f70926..7dcf204e50e5f6bc4a7bd1d6859a416724c1dfed 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -18,7 +18,7 @@
 #        current+1:0:0
 #
 
-VERSION_INFO = 6:0:0
+VERSION_INFO = 16:0:0
 
 # History:          VERSION_INFO
 #
@@ -33,8 +33,17 @@ VERSION_INFO = 6: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 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
 
@@ -44,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,6 +61,7 @@ libatalk_la_LIBADD  = \
        compat/libcompat.la     \
        dsi/libdsi.la           \
        iniparser/libiniparser.la \
+       talloc/libtalloc.la       \
        unicode/libunicode.la \
        util/libutil.la         \
        vfs/libvfs.la
@@ -63,6 +73,7 @@ libatalk_la_DEPENDENCIES = \
        cnid/libcnid.la \
        compat/libcompat.la     \
        dsi/libdsi.la           \
+       talloc/libtalloc.la       \
        iniparser/libiniparser.la \
        unicode/libunicode.la \
        util/libutil.la         \
@@ -103,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