Add vasprintf compatibility function

[netatalk.git] / libatalk / Makefile.am

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index 5b269737aa5b8d259a9f7fc36dc76385d7856b8f..d8733b35e92d66f5f67e5415e0b64503bcb4268a 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -18,7 +18,7 @@
 #        current+1:0:0
 #
 
-VERSION_INFO = 2:0:0
+VERSION_INFO = 6:0:0
 
 # History:          VERSION_INFO
 #
@@ -29,15 +29,22 @@ VERSION_INFO = 2:0:0
 #   3.0.0-beta2     1:0:0
 #   3.0             1:0:0
 #   3.0.1           2: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
 
-SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
 libatalk_la_SOURCES = dummy.c
 
+libatalk_la_CFLAGS = \
+       @PTHREAD_CFLAGS@
+
 libatalk_la_LIBADD  = \
-       @WRAP_LIBS@ @ACL_LIBS@ \
+       @WRAP_LIBS@ @ACL_LIBS@ @PTHREAD_LIBS@ \
        acl/libacl.la \
        adouble/libadouble.la   \
        bstring/libbstring.la \
@@ -46,7 +53,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
@@ -60,13 +66,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
@@ -90,4 +101,8 @@ endif
 EXTRA_DIST = \
        libatalk-3.0beta1.abi \
        libatalk-3.0beta2.abi \
-       libatalk-3.0.abi
+       libatalk-3.0.abi \
+       libatalk-3.0.1.abi \
+       libatalk-3.0.2.abi \
+       libatalk-3.0.3.abi \
+       libatalk-3.0.4.abi