Drop the usage of macros within macros as it seems some platforms native makes don...

[bacula/bacula] / bacula / src / lib / Makefile.in

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 9d3b46a77450961b4e5d59400d2c84f7e9a8dcb3..22d352989953fdf1509933438e8550a3dcf5598d 100644 (file)
--- 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) \