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 2debf389cb351c618d95e5e90348d8fdf5c3a380..9891ee645fbd4ed20fce77af3dcc3befc6b76c09 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -38,11 +38,11 @@ EXTRAOBJS = @OBJLIST@
 DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o
 
 NODIRTOOLS = bsmtp
-DIRTOOLS = bsmtp dbcheck fstype testfind testls
+DIRTOOLS = bsmtp dbcheck fstype testfind testls bregex bwild
 TOOLS = $(@DIR_TOOLS@)
 
 INSNODIRTOOLS = bsmtp
-INSDIRTOOLS = bsmtp dbcheck
+INSDIRTOOLS = bsmtp dbcheck bwild bregex
 INSTOOLS = $(INS@DIR_TOOLS@)
 
 
@@ -75,13 +75,23 @@ 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) bsmtp core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
-       @$(RMF) testfind dbcheck testls fstype
+       @$(RMF) $(DIRTOOLS)
 
 realclean: clean
        @$(RMF) tags
@@ -97,13 +107,14 @@ devclean: realclean
 # Allow non-root execution of bsmtp for non-root Directors
 install: $(INSTOOLS)
        @for tool in ${INSTOOLS} ; do \
-               $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \
+          $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \
        done
        chmod 755 $(DESTDIR)$(sbindir)/bsmtp
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bsmtp)
-       (cd $(DESTDIR)$(sbindir); $(RMF) dbcheck)
+       @for tool in ${INSTOOLS} ; do \
+          $(RMF) $(DESTDIR)$(sbindir)/$$tool ; \
+       done