X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2FMakefile.am;h=dc490948f9c9717f78dfdc0555e7b60b6d7138cd;hb=48434418007f625f292b16c99ee0dd7f9fcb1416;hp=06e869a332e97583d5052a33acfb787a929494de;hpb=006ac157bdfcbd8cba5f82eb232ba946324f278f;p=netatalk.git

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index 06e869a3..dc490948 100644
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -18,7 +18,7 @@
 #        current+1:0:0
 #
 
-VERSION_INFO = 6:0:0
+VERSION_INFO = 14:0:0
 
 # History:          VERSION_INFO
 #
@@ -33,8 +33,13 @@ 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 tdb util unicode vfs
+#   3.1.0           12:0:0
+#   3.1.1           13:0:0
+#   3.1.2           14:0:0
+
+SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc util unicode vfs
 
 lib_LTLIBRARIES = libatalk.la
 
@@ -44,7 +49,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 +57,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
@@ -64,14 +69,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
@@ -99,4 +110,9 @@ 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.1.abi