This commit was manufactured by cvs2svn to create tag

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

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index e93c5eddd92cfb832731aa5e29c041cac8982fec..9891ee645fbd4ed20fce77af3dcc3befc6b76c09 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -5,6 +5,8 @@
 #
 @MCOMMON@
 
+PYTHON_INC = @PYTHON_INCDIR@
+
 srcdir =       .
 VPATH =        .
 .PATH:         .
@@ -23,41 +25,73 @@ dummy:
 
 #
 
+GETTEXT_LIBS = @LIBINTL@
+
+OPENSSL_INC = @OPENSSL_INC@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+
 FINDOBJS = testfind.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
+DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o
+
+NODIRTOOLS = bsmtp
+DIRTOOLS = bsmtp dbcheck fstype testfind testls bregex bwild
+TOOLS = $(@DIR_TOOLS@)
+
+INSNODIRTOOLS = bsmtp
+INSDIRTOOLS = bsmtp dbcheck bwild bregex
+INSTOOLS = $(INS@DIR_TOOLS@)
+
+
 .SUFFIXES:     .c .o
 .PHONY:
 .DONTCARE:
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile smtp dbcheck
+all: Makefile $(TOOLS) 
        @echo "==== Make of tools is good ===="
        @echo " "
 
-smtp:  smtp.o ../lib/libbac.a        
-       $(CXX) $(LDFLAGS) -L../lib -o $@ smtp.o -lbac -lm $(LIBS) $(DLIB)
+bsmtp: bsmtp.o ../lib/libbac.a        
+       $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+dbcheck: dbcheck.o ../lib/libbac.a ../cats/libsql.a $(DIRCONFOBJS)
+       $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) -lsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
-dbcheck: dbcheck.o ../lib/libbac.a ../cats/libsql.a
-       $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o -lbac -lsql -lm $(LIBS) $(DB_LIBS)
+fstype: fstype.o ../lib/libbac.a ../findlib/libfind.a
+       $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lfind -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 testfind: ../findlib/libfind.a ../lib/libbac.a $(FINDOBJS)
-       $(CC) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(FINDOBJS) \
-         $(LIBS) $(DLIB) -lfind -lbac -lm
- 
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(FINDOBJS) \
+         $(DLIB) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+testls: ../findlib/libfind.a ../lib/libbac.a testls.o
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
+         $(DLIB) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+bregex: ../findlib/libfind.a ../lib/libbac.a bregex.o
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
+         $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+bwild: ../findlib/libfind.a ../lib/libbac.a bwild.o
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
+         $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 clean:
-       @$(RMF) smtp core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
-       @$(RMF) testfind dbcheck
+       @$(RMF) bsmtp core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+       @$(RMF) $(DIRTOOLS)
 
 realclean: clean
        @$(RMF) tags
@@ -66,11 +100,21 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
 
-install: smtp
-       $(INSTALL_PROGRAM) smtp $(DESTDIR)$(sbindir)/smtp      
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
+# Allow non-root execution of bsmtp for non-root Directors
+install: $(INSTOOLS)
+       @for tool in ${INSTOOLS} ; do \
+          $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \
+       done
+       chmod 755 $(DESTDIR)$(sbindir)/bsmtp
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) smtp)
+       @for tool in ${INSTOOLS} ; do \
+          $(RMF) $(DESTDIR)$(sbindir)/$$tool ; \
+       done
 
 
 
@@ -83,12 +127,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) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.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
 
 # -----------------------------------------------------------------------