X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=libatalk%2FMakefile.am;h=beafce4862e394a4b8d104a13576d6bbae50f582;hb=e018333a82dd661e915c3da07a62891e820548d6;hp=cb1b6d2bf72500481d32528c8ba502ecb639bab5;hpb=f2d81f1a92e5e8348e174a843c2b1cdd0e77ae01;p=netatalk.git

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index cb1b6d2b..beafce48 100644
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -10,17 +10,15 @@
 #               support?
 #
 # To increment a VERSION_INFO (current:revision:age):
-#    If the ABI didn't change:
-#        Return (current:revision+1:age)
+#    If the ABI didn't change, but any library code changed:
+#        current:revision+1:age
 #    If the ABI changed, but it's backward-compatible:
-#        Return (current+1:0:age+1)
+#        current+1:0:age+1
 #    If the ABI changed and it isn't backward-compatible:
-#        Return (current+1:0:0)
+#        current+1:0:0
 #
-# Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
-# UNLESS YOU REALLY REALLY HAVE TO.
 
-VERSION_INFO = 1:0:0
+VERSION_INFO = 7:0:0
 
 # History:          VERSION_INFO
 #
@@ -28,15 +26,26 @@ VERSION_INFO = 1:0:0
 #   3.0.0-alpha2    0:0:0
 #   3.0.0-alpha3    0: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
+#   3.0.6           7:0:0
 
-SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser 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 +53,6 @@ libatalk_la_LIBADD  = \
 	compat/libcompat.la	\
 	dsi/libdsi.la		\
 	iniparser/libiniparser.la \
-	tdb/libtdb.la       \
 	unicode/libunicode.la \
 	util/libutil.la		\
 	vfs/libvfs.la
@@ -57,13 +65,18 @@ libatalk_la_DEPENDENCIES = \
 	compat/libcompat.la	\
 	dsi/libdsi.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
@@ -86,4 +99,11 @@ endif
 
 EXTRA_DIST = \
 	libatalk-3.0beta1.abi \
-	libatalk-3.0beta2.abi
+	libatalk-3.0beta2.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 \
+	libatalk-3.0.5.abi \
+	libatalk-3.0.6.abi