X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fconsole%2FMakefile.in;h=0186d3369cf7feecc1ef9e2cc3c87460566949f1;hb=d9b7c3a08c08c031a44519f497dcce964f219234;hp=93661945dcf4860922970cf5cdf3629e0f9e2b75;hpb=5eb4d01116ff4fa301d4b38de5cefc57635cd8e4;p=bacula%2Fbacula

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 93661945dc..0186d3369c 100644
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -20,12 +20,14 @@ first_rule: all
 dummy:
 
 #
-CONSSRCS = console.c console_conf.c authenticate.c
-CONSOBJS = console.o console_conf.o authenticate.o
+CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ 
+CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
+GETTEXT_LIBS = @LIBINTL@
+
 CONS_INC=@CONS_INC@
 CONS_LIBS=@CONS_LIBS@
 CONS_LDFLAGS=@CONS_LDFLAGS@
@@ -36,20 +38,23 @@ CONS_LDFLAGS=@CONS_LDFLAGS@
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_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 ../cats/libsql.a
-	$(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+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 ../cats/libsql.a
-	$(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+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 $@
 
 
@@ -57,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
 
@@ -66,23 +74,42 @@ 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
+	(cd $(srcdir); $(RMF) Makefile)
 
 install: all
-	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(sbindir)/bconsole
+	@if test -f ${DESTDIR}${sbindir}/console; then \
+	   echo " "; \
+	   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
+	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
 	@srcconf=bconsole.conf; \
 	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
 	   destconf=$$srcconf.new; \
 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
 	else \
 	   destconf=$$srcconf; \
+	   if  test -f ${DESTDIR}${sysconfdir}/console.conf; then \
+	      echo "Existing console.conf moved to bconsole.conf"; \
+	      @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
+	      destconf=$$srcconf.new; \
+	   fi; \
 	fi; \
 	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+	if test -f static-bconsole; then \
+	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
+	fi
 
 uninstall:
-	(cd $(DESTDIR)$(sbindir); $(RMF) bconsole)
-	(cd $(DESTDIR)$(sysconfdir); $(RMF) bconsole.conf bconsole.conf.new)
+	(cd $(DESTDIR)$(sbindir); $(RMF) bconsole static-bconsole)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf bconsole.conf bconsole.conf.new)
 
 
 
@@ -95,12 +122,12 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CC) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+	@$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \
 	   $(MV) Makefile.bak Makefile; \
-	   echo -e "Something went wrong\n\a"; \
+	   echo " ===== Something went wrong in make depend ====="; \
 	fi
 
 # -----------------------------------------------------------------------