Windows tweaks

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

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index c6f0eea85a1875cce7c91ccaf1fe21a167bcac23..91c48f7c063854893148e8eef8d5d9fd95367523 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,3 +1,9 @@
+#
+# Bacula Makefile
+#
+#  Version $Id$
+#
+
 @MCOMMON@
 
 srcdir =       .
@@ -19,10 +25,10 @@ dummy:
 #
 SVRSRCS = filed.c authenticate.c backup.c estimate.c \
          filed_conf.c job.c \
-         restore.c status.c verify.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
+         restore.o status.o verify.o verify_vol.o
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
@@ -41,9 +47,9 @@ 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 " "
 
@@ -65,15 +71,22 @@ win32:      $(WIN32OBJS)
        @rm -f bacula-fd.exe
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
-       $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+       $(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) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./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,7 +96,7 @@ 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
@@ -97,12 +110,13 @@ 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
 
 uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf)
+       (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf.new)