From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 1 Jun 2010 12:46:57 +0000 (+0200)
Subject: Update makefiles for new libtool revision
X-Git-Tag: Release-5.2.1~1318
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f79a8def536db0c336f33a9e51d2ba3194362f61;p=bacula%2Fbacula

Update makefiles for new libtool revision
---

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 1f2b914bc1..a607e5f5f1 100644
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -34,9 +34,7 @@ LIBBACSQL_SRCS = mysql.c dbi.c \
 LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o)
 LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo)
 
-LIBBACSQL_LT_CURRENT = @LIBBACSQL_LT_CURRENT@
-LIBBACSQL_LT_REVISION = @LIBBACSQL_LT_REVISION@
-LIBBACSQL_LT_AGE = @LIBBACSQL_LT_AGE@
+LIBBACSQL_LT_RELEASE = @LIBBACSQL_LT_RELEASE@
 
 .SUFFIXES:	.c .o .lo
 .PHONY:
@@ -69,7 +67,7 @@ libbacsql.a: $(LIBBACSQL_OBJS)
 
 libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
 	@echo "Making $@ ..."	  
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_CURRENT).$(LIBBACSQL_LT_REVISION).$(LIBBACSQL_LT_AGE) $(DB_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index d581f6f9aa..bb3161e866 100644
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -31,9 +31,7 @@ LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \
 LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o)
 LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo)
 
-LIBBACFIND_LT_CURRENT = @LIBBACFIND_LT_CURRENT@
-LIBBACFIND_LT_REVISION = @LIBBACFIND_LT_REVISION@
-LIBBACFIND_LT_AGE = @LIBBACFIND_LT_AGE@
+LIBBACFIND_LT_RELEASE = @LIBBACFIND_LT_RELEASE@
 
 .SUFFIXES:	.c .o .lo
 .PHONY:
@@ -59,7 +57,7 @@ libbacfind.a: $(LIBBACFIND_OBJS)
 
 libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index ed63d742d3..8b4647ff21 100644
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -3,17 +3,9 @@
 @MCOMMON@
 
 # Define library versions
-LIBBAC_LT_CURRENT = @LIBBAC_LT_CURRENT@
-LIBBAC_LT_REVISION = @LIBBAC_LT_REVISION@
-LIBBAC_LT_AGE = @LIBBAC_LT_AGE@
-
-LIBBACCFG_LT_CURRENT = @LIBBACCFG_LT_CURRENT@
-LIBBACCFG_LT_REVISION = @LIBBACCFG_LT_REVISION@
-LIBBACCFG_LT_AGE = @LIBBACCFG_LT_AGE@
-
-LIBBACPY_LT_CURRENT = @LIBBACPY_LT_CURRENT@
-LIBBACPY_LT_REVISION = @LIBBACPY_LT_REVISION@
-LIBBACPY_LT_AGE = @LIBBACPY_LT_AGE@
+LIBBAC_LT_RELEASE = @LIBBAC_LT_RELEASE@
+LIBBACCFG_LT_RELEASE = @LIBBACCFG_LT_RELEASE@
+LIBBACPY_LT_RELEASE = @LIBBACPY_LT_RELEASE@
 
 #
 python = @PYTHON_INCDIR@
@@ -128,7 +120,7 @@ libbac.a: $(LIBBAC_OBJS)
 
 libbac.la: Makefile $(LIBBAC_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."
@@ -137,7 +129,7 @@ libbaccfg.a: $(LIBBACCFG_OBJS)
 
 libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE)
 
 libbacpy.a: $(LIBBACPY_OBJS) 
 	@echo "Making $@ ..."
@@ -146,7 +138,7 @@ libbacpy.a: $(LIBBACPY_OBJS)
 
 libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \