Integrate Phil's Makefile patch

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

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index 258c08fd578b399a34f50e914b8992358144cd6f..ced8002607464dfbed55b84c81fb81f5be459c82 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -1,3 +1,8 @@
+#
+# Bacula Tools Makefile
+#
+# Version $Id$
+#
 @MCOMMON@
 
 srcdir =       .
@@ -31,41 +36,52 @@ EXTRAOBJS = @OBJLIST@
 .c.o:
        $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile smtp dbcheck
+all: Makefile bsmtp dbcheck testfind testls 
        @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 $(LIBS) $(DLIB)
 
 dbcheck: dbcheck.o ../lib/libbac.a ../cats/libsql.a
-       $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o -lbac -lsql -lm $(LIBS) $(DB_LIBS)
+       $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o -lsql -lbac -lm $(LIBS) $(DB_LIBS)
 
 testfind: ../findlib/libfind.a ../lib/libbac.a $(FINDOBJS)
-       $(CC) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(FINDOBJS) \
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(FINDOBJS) \
+         $(LIBS) $(DLIB) -lfind -lbac -lm
+
+testls: ../findlib/libfind.a ../lib/libbac.a testls.o
+       $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
          $(LIBS) $(DLIB) -lfind -lbac -lm
- 
 
 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) testfind dbcheck testls
 
 realclean: clean
-       @$(RMF) tags Makefile
+       @$(RMF) tags
 
 distclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+
+devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
 
-install: smtp
-       $(INSTALL_PROGRAM) smtp $(DESTDIR)$(sbindir)/smtp      
+# Allow non-root execution of bsmtp for non-root Directors
+install: bsmtp
+       $(INSTALL_PROGRAM) bsmtp $(DESTDIR)$(sbindir)/bsmtp      
+       chmod 755 $(DESTDIR)$(sbindir)/bsmtp
+       $(INSTALL_PROGRAM) dbcheck $(DESTDIR)$(sbindir)/dbcheck      
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) smtp)
+       (cd $(DESTDIR)$(sbindir); $(RMF) bsmtp)
+       (cd $(DESTDIR)$(sbindir); $(RMF) dbcheck)