Integrate Phil's Makefile patch

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

diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in
index d8a7493d4d7a0203986762523aca65367772ae97..d25f21dd8a645f54d0e375bf3fc8f77970294b2c 100755 (executable)
--- a/bacula/src/filed/win32/Makefile.in
+++ b/bacula/src/filed/win32/Makefile.in
@@ -1,8 +1,12 @@
 #
 # makefile to build Windows specific pieces of the Bacula File daemon
 #
+# Version $Id$
+#
 CFLAGS=@CFLAGS@
+WCFLAGS=@WCFLAGS@
 CC = @CC@
+CXX = @CXX@
 RANLIB = @RANLIB@
 SHELL = /bin/sh
 
@@ -46,13 +50,7 @@ winres.res: winres.rc bacula.ico winres.h idle.ico running.ico error.ico
        windres $< -O coff -o $@
 
 winmain.o: winmain.cpp winbacula.h
-       $(CC) -c $(CFLAGS) $<
-
-email.o: email.c
-       $(CC) -c ${CFLAGS} $<
-
-email.exe: email.o libmymapi32.a
-       $(CC) ${CFLAGS} -L. -o email email.o -luser32 -lgdi32 -lmymapi32
+       $(CC) -c $(WCFLAGS) $(CFLAGS) $<
 
 libmymapi32.a: mymapi32.def
        dlltool --as=as -k --output-lib $@ --def $<
@@ -63,25 +61,30 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 
 clean:
        rm -f *.exe *.o *.res *.a 1 2 3
-       rm -f bin/bacula-fd.exe bin/smtp.exe bin/testfind.exe
+       rm -f bin/smtp.exe bin/console.exe
+       rm -f bin/bacula-fd.exe bin/bsmtp.exe bin/testfind.exe
 
 distclean: clean
-       rm -f Makefile
+       @rm -f Makefile
+       @rm -rf bin/CVS CVS
+
+devclean: clean
+       @rm -f Makefile
 
 install:
-       @mkdir -p $(sbindir) /tmp $(sbindir)/../working
+       @mkdir -p $(DESTDIR)$(sbindir) $(DESTDIR)/tmp $(DESTDIR)$(sbindir)/../working
        @echo "Installing system binary files ..."
        @strip ../bacula-fd.exe
-       @strip ../../tools/smtp.exe
+       @strip ../../tools/bsmtp.exe
        @strip ../../tools/testfind.exe
-       @strip ../../console/console.exe
+       @strip ../../console/bconsole.exe
        @cp -f ../bacula-fd.exe bin/
-       @cp -f ../../tools/smtp.exe bin/
+       @cp -f ../../tools/bsmtp.exe bin/
        @cp -f ../../tools/testfind.exe bin/
-       @cp -f ../../console/console.exe bin/
-       @cp -f bin/* $(sbindir)
-       @cp -f ../bacula-fd.conf $(sysconfdir)/bacula-fd.conf.new
-       @cp -f ../../console/console.conf $(sysconfdir)/console.conf.new
+       @cp -f ../../console/bconsole.exe bin/
+       @cp -f bin/* $(DESTDIR)$(sbindir)
+       @cp -f ../bacula-fd.conf $(DESTDIR)$(sysconfdir)/bacula-fd.conf.new
+       @cp -f ../../console/bconsole.conf $(DESTDIR)$(sysconfdir)/bconsole.conf.new
 
 # Make a Win32 binary release 
 binary-release:
@@ -91,17 +94,17 @@ binary-release:
        @echo "Copying system binary files ..."
        @cp bin/* wr/$(sbindir)
        @strip ../bacula-fd.exe
-       @strip ../../tools/smtp.exe
+       @strip ../../tools/bsmtp.exe
        @strip ../../tools/testfind.exe
-       @strip ../../console/console.exe
+       @strip ../../console/bconsole.exe
        @echo "Copying executables ..."
        @cp -f ../bacula-fd.exe wr/$(sbindir)/bacula-fd.exe 
-       @cp -f ../../tools/smtp.exe wr/$(sbindir)/smtp.exe 
+       @cp -f ../../tools/bsmtp.exe wr/$(sbindir)/bsmtp.exe 
        @cp -f ../../tools/testfind.exe wr/$(sbindir)/testfind.exe 
-       @cp -f ../../console/console.exe wr/$(sbindir)/console.exe 
+       @cp -f ../../console/bconsole.exe wr/$(sbindir)/bconsole.exe 
        @echo "Copying bacula-fd.conf..."
        @cp -f ../bacula-fd.conf wr/$(sysconfdir)/bacula-fd.conf.new
-       @cp -f ../../console/console.conf wr/$(sysconfdir)/console.conf.new
+       @cp -f ../../console/bconsole.conf wr/$(sysconfdir)/bconsole.conf.new
 # the two dummy files are necessary to insure that WinZip
 # actually creates the directories.
        @echo "dummy" >wr/tmp/dummy.txt
@@ -116,7 +119,7 @@ binary-release:
 dummy:
 
 .c.o:
-       $(CC) -c $(CFLAGS) $<
+       $(CC) -c $(WCFLAGS) $(CFLAGS) $<
 
 .cpp.o:
-       $(CC) -c $(CFLAGS) $<
+       $(CXX) -c $(WCFLAGS) $(CFLAGS) $<