Update makefiles for new libtool revision

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index ca54865e2b893073a72718413aac56c52ba33e7e..296d8242e60da3634038eee087f551588d34fa74 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -34,9 +34,7 @@ LIBBACSQL_SRCS = mysql.c bdb.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 fc2ac3cbaab9c429aac0cb557b52f1f1ece5eaf0..a9b6ce0ea11c03e7cbea3eef4f28c2ccbae61873 100644 (file)
--- 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 4d41a10da017011c82ee74beaf90724f1f1e4e51..0747d503d8149169aeb5ff49a34b67192a61ec0a 100644 (file)
--- 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@
@@ -126,7 +118,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)
+       $(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 $@ ..."
@@ -135,7 +127,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 $@ ..."
@@ -144,7 +136,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) \