Windows tweaks

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

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 6b64ef74dff5e2f036a8daa13b9e1ffcc3c53875..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 =       .
@@ -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,11 +71,11 @@ win32:      $(WIN32OBJS)
        @rm -f bacula-fd.exe
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
-       $(CXX) $(LDFLAGS) $(FD_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) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
           $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
        strip $@
 
@@ -80,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
@@ -89,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
@@ -103,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)