Fix some trivial errors and implemented the restore of IRIX xattrs.

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

diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index 1084eaeec51edeb3a54226cb1d73964f278b31b4..78fae6fba4b872d510e386299f74a313c035f789 100644 (file)
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -45,8 +45,6 @@ _cppflags =
 # wx-config generated by configure
 CONS_CPPFLAGS=-DHAVE_WXCONSOLE @WXCONS_CPPFLAGS@ $(@MACOSX@_cppflags)
 CONS_LDFLAGS=@WXCONS_LDFLAGS@
-OPENSSL_INC = @OPENSSL_INC@
-OPENSSL_LIBS = @OPENSSL_LIBS@
 
 
 .SUFFIXES:     .cpp .c .o
@@ -57,12 +55,12 @@ OPENSSL_LIBS = @OPENSSL_LIBS@
 .c.o:
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) \
- $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
+ -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
 
 .cpp.o:
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) \
- $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
+ -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
 
 
 #-------------------------------------------------------------------------
@@ -83,9 +81,9 @@ bwx-console.app: bwx-console
        mv bwx-console bwx-console.app/Contents/MacOS/bwx-console
        cp bwx-console.conf /Library/Preferences/org.bacula.wxconsole.conf
 
-bwx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a
-       $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
- -lbac $(OPENSSL_LIBS)
+bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+       $(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \
+         -lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS)
 
 win32: bwx-console_private.res
        
@@ -93,7 +91,10 @@ win32: bwx-console_private.res
 bwx-console_private.res: bwx-console_private.rc 
        windres.exe -i bwx-console_private.rc -I rc -o bwx-console_private.res -O coff 
 
-clean:
+libtool-clean:
+       @$(RMF) -r .libs _libs
+
+clean: libtool-clean
        @$(RMF) $(CONSOBJS) bwx-console $(WIN32RES)
 
 distclean: clean
@@ -104,7 +105,14 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install: all
-       $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
+       @if test -f ${DESTDIR}${sbindir}/wx-console; then \
+          echo " "; \
+          echo "Warning!!!  ${DESTDIR}${sbindir}/wx-console found."; \
+          echo " wx-console has been renamed bwx-console, so wx-console"; \
+          echo " is no longer used, and you might want to delete it."; \
+          echo " "; \
+       fi
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
        @srcconf=bwx-console.conf; \
        if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
           destconf=$$srcconf.new; \