X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2FMakefile.am;h=d8733b35e92d66f5f67e5415e0b64503bcb4268a;hp=57e75951cd2d299a1e129dbaceebb6b1fac9e8f0;hb=bcb41b85b62fcc24337c9a7748dd64c10044fe46;hpb=084ad4c4130bfdd677131132c65f73da4e1b20ad

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index 57e75951..d8733b35 100644
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -18,7 +18,7 @@
 #        current+1:0:0
 #
 
-VERSION_INFO = 1:0:0
+VERSION_INFO = 6:0:0
 
 # History:          VERSION_INFO
 #
@@ -28,15 +28,23 @@ VERSION_INFO = 1:0:0
 #   3.0.0-beta1     0: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 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 \
@@ -44,7 +52,7 @@ libatalk_la_LIBADD  = \
 	compat/libcompat.la	\
 	dsi/libdsi.la		\
 	iniparser/libiniparser.la \
-	tdb/libtdb.la       \
+	talloc/libtalloc.la       \
 	unicode/libunicode.la \
 	util/libutil.la		\
 	vfs/libvfs.la
@@ -56,14 +64,20 @@ libatalk_la_DEPENDENCIES = \
 	cnid/libcnid.la \
 	compat/libcompat.la	\
 	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
@@ -87,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