From b630ee5661ffa7bb90dbe03107b269b9d51bf2f9 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Wed, 23 Dec 2009 11:07:45 +0100 Subject: [PATCH] Drop the usage of macros within macros as it seems some platforms native makes don't support that. While converting the Makefiles also made things somewhat more uniform in naming the lib objects. --- bacula/src/cats/Makefile.in | 19 ++++++++++--------- bacula/src/findlib/Makefile.in | 17 +++++++++-------- bacula/src/lib/Makefile.in | 21 ++++++++++++--------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 501c713474..5ed376f990 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -26,11 +26,12 @@ dummy: # INCLUDE_FILES = bdb.h cats.h protos.h sql_cmds.h -LIBSRCS = mysql.c bdb.c dbi.c \ - sql.c sql_cmds.c sql_create.c sql_delete.c sql_find.c \ - sql_get.c sql_list.c sql_update.c sqlite.c \ - postgresql.c bvfs.c -LIBOBJS = $(LIBSRCS:.c=$(DEFAULT_OBJECT_TYPE)) +LIBBACSQL_SRCS = mysql.c bdb.c dbi.c \ + sql.c sql_cmds.c sql_create.c sql_delete.c sql_find.c \ + sql_get.c sql_list.c sql_update.c sqlite.c \ + postgresql.c bvfs.c +LIBBACSQL_OBJS = $(LIBBACSQL_SRCS:.c=.o) +LIBBACSQL_LOBJS = $(LIBBACSQL_SRCS:.c=.lo) LIBBACSQL_LT_CURRENT = 1 LIBBACSQL_LT_REVISION = 0 @@ -53,14 +54,14 @@ all: Makefile libbacsql$(DEFAULT_ARCHIVE_TYPE) @echo "==== Make of sqllib is good ====" @echo " " -libbacsql.a: $(LIBOBJS) +libbacsql.a: $(LIBBACSQL_OBJS) @echo "Making $@ ..." - $(AR) rc $@ $(LIBOBJS) + $(AR) rc $@ $(LIBBACSQL_OBJS) $(RANLIB) $@ -libbacsql.la: Makefile $(LIBOBJS) +libbacsql.la: Makefile $(LIBBACSQL_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(DB_LIBS) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(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 62363b6d55..b77993b14f 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -25,10 +25,11 @@ dummy: INCLUDE_FILES = bfile.h find.h protos.h savecwd.h # -LIBSRCS = find.c match.c find_one.c attribs.c create_file.c \ - bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \ - savecwd.c -LIBOBJS = $(LIBSRCS:.c=$(DEFAULT_OBJECT_TYPE)) +LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \ + bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \ + savecwd.c +LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o) +LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo) LIBBACFIND_LT_CURRENT = 1 LIBBACFIND_LT_REVISION = 0 @@ -51,14 +52,14 @@ all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_T @echo "==== Make of findlib is good ====" @echo " " -libbacfind.a: $(LIBOBJS) +libbacfind.a: $(LIBBACFIND_OBJS) @echo "Making $@ ..." - $(AR) rc $@ $(LIBOBJS) + $(AR) rc $@ $(LIBBACFIND_OBJS) $(RANLIB) $@ -libbacfind.la: Makefile $(LIBOBJS) +libbacfind.la: Makefile $(LIBBACFIND_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index 9d3b46a774..22d3529899 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -51,7 +51,8 @@ LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c bget_msg.c \ signal.c smartall.c rblist.c tls.c tree.c \ util.c var.c watchdog.c workq.c btimers.c \ address_conf.c breg.c htable.c lockmgr.c -LIBBAC_OBJS = $(LIBBAC_SRCS:.c=$(DEFAULT_OBJECT_TYPE)) +LIBBAC_OBJS = $(LIBBAC_SRCS:.c=.o) +LIBBAC_LOBJS = $(LIBBAC_SRCS:.c=.lo) LIBBAC_LT_CURRENT = 1 LIBBAC_LT_REVISION = 0 LIBBAC_LT_AGE = 0 @@ -60,7 +61,8 @@ LIBBAC_LT_AGE = 0 # libbaccfg (config functions) # LIBBACCFG_SRCS = parse_conf.c res.c -LIBBACCFG_OBJS = $(LIBBACCFG_SRCS:.c=$(DEFAULT_OBJECT_TYPE)) +LIBBACCFG_OBJS = $(LIBBACCFG_SRCS:.c=.o) +LIBBACCFG_LOBJS = $(LIBBACCFG_SRCS:.c=.lo) LIBBACCFG_LT_CURRENT = 1 LIBBACCFG_LT_REVISION = 0 LIBBACCFG_LT_AGE = 0 @@ -69,7 +71,8 @@ LIBBACCFG_LT_AGE = 0 # libbacpy (python functions) # LIBBACPY_SRCS = pythonlib.c -LIBBACPY_OBJS = $(LIBBACPY_SRCS:.c=$(DEFAULT_OBJECT_TYPE)) +LIBBACPY_OBJS = $(LIBBACPY_SRCS:.c=.o) +LIBBACPY_LOBJS = $(LIBBACPY_SRCS:.c=.lo) LIBBACPY_LT_CURRENT = 1 LIBBACPY_LT_REVISION = 0 LIBBACPY_LT_AGE = 0 @@ -115,27 +118,27 @@ libbac.a: $(LIBBAC_OBJS) $(AR) rc $@ $(LIBBAC_OBJS) $(RANLIB) $@ -libbac.la: Makefile $(LIBBAC_OBJS) +libbac.la: Makefile $(LIBBAC_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_OBJS) -export-dynamic -rpath $(libdir) -version-info $(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) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) libbaccfg.a: $(LIBBACCFG_OBJS) @echo "Making $@ ..." $(AR) rc $@ $(LIBBACCFG_OBJS) $(RANLIB) $@ -libbaccfg.la: Makefile $(LIBBACCFG_OBJS) +libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) libbacpy.a: $(LIBBACPY_OBJS) @echo "Making $@ ..." $(AR) rc $@ $(LIBBACPY_OBJS) $(RANLIB) $@ -libbacpy.la: Makefile $(LIBBACPY_OBJS) +libbacpy.la: Makefile $(LIBBACPY_LOBJS) @echo "Making $@ ..." - $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ -- 2.39.5