Restore win32 dir from Branch-5.2 and update it

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

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 162d39625adee396ca6caafa4028595876a31e19..22ae13ae36f0d7990adc5c725edecbf7b4c12c6a 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -1,6 +1,6 @@
 #
-# Author: Kern Sibbald
-# License: LGPLv3
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
 #
 @MCOMMON@
 
@@ -21,8 +21,9 @@ first_rule: all
 dummy:
 
 #
-CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ 
+CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
 CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
+JSONOBJS = bbconsjson.o console_conf.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -42,7 +43,7 @@ CONS_LDFLAGS=@CONS_LDFLAGS@
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile bconsole @STATIC_CONS@
+all: Makefile bconsole @STATIC_CONS@ bbconsjson
        @echo "==== Make of console is good ===="
        @echo " "
 
@@ -52,6 +53,11 @@ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libba
              $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
              $(OPENSSL_LIBS)
 
+bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+       $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
+             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_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) \
@@ -89,7 +95,8 @@ install: all
           echo " is no longer used, and you might want to delete it."; \
           echo " "; \
        fi
-       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM_ALL) bconsole $(DESTDIR)$(sbindir)/bconsole
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bbconsjson $(DESTDIR)$(sbindir)/bbconsjson
        @srcconf=bconsole.conf; \
        if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
           destconf=$$srcconf.new; \
@@ -109,11 +116,10 @@ install: all
        fi
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bconsole static-bconsole)
+       (cd $(DESTDIR)$(sbindir); $(RMF) bconsole static-bconsole bbconsjson)
        (cd $(DESTDIR)$(sysconfdir); $(RMF) console.conf bconsole.conf bconsole.conf.new)
 
 
-
 # Semi-automatic generation of dependencies:
 # Use gcc -MM because X11 `makedepend' doesn't work on all systems
 # and it also includes system headers.