bat: cleanup job and mediainfo panel

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

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 95f2026de79cf41f41ef666efb9d58b04074a0cd..0186d3369cf7feecc1ef9e2cc3c87460566949f1 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -26,8 +26,7 @@ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
-OPENSSL_INC = @OPENSSL_INC@
-OPENSSL_LIBS = @OPENSSL_LIBS@
+GETTEXT_LIBS = @LIBINTL@
 
 CONS_INC=@CONS_INC@
 CONS_LIBS=@CONS_LIBS@
@@ -39,20 +38,23 @@ CONS_LDFLAGS=@CONS_LDFLAGS@
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile bconsole @STATIC_CONS@
        @echo "==== Make of console is good ===="
        @echo " "
 
 
-bconsole: $(CONSOBJS) ../lib/libbac.a
-       $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+       $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+             $(OPENSSL_LIBS)
 
-static-bconsole: $(CONSOBJS) ../lib/libbac.a
-       $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+       $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+             $(OPENSSL_LIBS)
        strip $@
 
 
@@ -60,7 +62,10 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-clean:
+libtool-clean:
+       @$(RMF) -r .libs _libs
+
+clean: libtool-clean
        @$(RMF) console bconsole core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-console static-bconsole gmon.out
 
@@ -69,7 +74,7 @@ realclean: clean
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+       (cd $(srcdir); $(RMF) Makefile)
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
@@ -78,12 +83,12 @@ devclean: realclean
 install: all
        @if test -f ${DESTDIR}${sbindir}/console; then \
           echo " "; \
-          echo "Warning!!!  ${DESTDIR}${sbindir}console found."; \
+          echo "Warning!!!  ${DESTDIR}${sbindir}/console found."; \
           echo " console has been renamed bconsole, so console"; \
           echo " is no longer used, and you might want to delete it."; \
           echo " "; \
        fi
-       $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
        @srcconf=bconsole.conf; \
        if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
           destconf=$$srcconf.new; \
@@ -99,7 +104,7 @@ install: all
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
        if test -f static-bconsole; then \
-          $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
+          $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
        fi
 
 uninstall: