- Add a kludge to detect bad date/times, which cause a seg fault in

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

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index dcc7032603d4348e19d4c6eab026511dde041fd1..3909c4a7846169999eef9adfbf4094fb8ea6c989 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,3 +1,9 @@
+#
+# Bacula Makefile for the File daemon
+#
+#  Version $Id$
+#
+
 @MCOMMON@
 
 srcdir =       .
@@ -18,11 +24,11 @@ dummy:
 
 #
 SVRSRCS = filed.c authenticate.c backup.c estimate.c \
-         filed_conf.c job.c \
-         restore.c status.c verify.c
+         filed_conf.c heartbeat.c job.c \
+         restore.c status.c verify.c verify_vol.c
 SVROBJS = filed.o authenticate.o backup.o estimate.o \
-         filed_conf.o job.o \
-         restore.o status.o verify.o
+         filed_conf.o heartbeat.o job.o \
+         restore.o status.o verify.o verify_vol.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -41,32 +47,38 @@ WIN32LIBS = $(@WIN32@)
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile @WIN32@ bacula-fd       
+all: Makefile @WIN32@ bacula-fd @STATIC_FD@
        @echo "==== Make of filed is good ===="
        @echo " "
 
 win32/winlib.a:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 win32/winmain.o:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 win32/winres.res:
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 # win32 libraries if needed
 win32: $(WIN32OBJS)
-       (cd win32; $(MAKE))
+       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
        @rm -f bacula-fd.exe
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
-       $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-         $(WIN32LIBS) $(FDLIBS) $(LIBS) $(DLIB) -lfind -lbac -lm
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+         $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+
+static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+       strip $@
+
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
@@ -74,6 +86,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 
 clean:
        @$(RMF) bacula-fd filed core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+       @$(RMF) static-bacula-fd
        if test -f win32/Makefile; then \
           (cd win32; $(MAKE) clean); \
        fi
@@ -83,11 +96,18 @@ realclean: clean
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
-       (cd $(srcdir); $(RMF) Makefile)
+       (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
        if test -f win32/Makefile; then \
           (cd win32; $(MAKE) distclean); \
        fi
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+       if test -f win32/Makefile; then \
+          (cd win32; $(MAKE) devclean); \
+       fi
+
 install: all
        $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
        @srcconf=bacula-fd.conf; \
@@ -97,12 +117,18 @@ install: all
        else \
           destconf=$$srcconf; \
        fi; \
-       echo "${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
-       ${INSTALL_DATA} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+       echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+       ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+       @if test -f static-bacula-fd; then \
+          $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
+       fi
+
+
 
 uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf)
+       (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf.new)
 
 
 
@@ -115,7 +141,7 @@ 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) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \