Tweak fix MySQL quoting again :-(

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

diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in
index 3cf3d1f2adf5ad98fe0ec83ac0613ad8f4b94f58..c0e5f9bcb57639456ce0d983dd6ac0657775d837 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -3,8 +3,13 @@
 # Using MinGW cross-compiler on GNU/Linux
 #
 #  Written by Robert Nelson, June 2006
+#
 #  Absolute paths used in place of relative paths
 #      Kern Sibbald, October 2008
+#   Split Win32 and Win64 objects and binaries. However
+#     the clean is a significant kludge -- hard coded.
+#     The object directories are deleted during make clean,
+#     so don't point them to any source directory.
 #
 
 # Global Configuration
@@ -43,14 +48,14 @@ STAB2CV := $(DEPKGS32)/tools/bin/stab2cv
 WIN64=@WIN64@
 
 ifeq ($(WIN64),yes)
-   CFLAGS := -g -Wall -mno-cygwin -mthreads -O3 -fno-strict-aliasing -DHAVE_VSS64
+   CFLAGS := -g -Wall -mno-cygwin -mthreads -O3 -fno-strict-aliasing -DHAVE_VSS64 -Wno-unknown-pragmas
    LIBS_NETWORK := -lws2_32
    WIN_VERSION := 64
    BINDIR := $(BUILDDIR)/release64
    LIBDIR := $(BUILDDIR)/release64
    OBJDIR := obj64
 else
-   CFLAGS := -g -Wall -mno-cygwin -m32 -mwin32 -mthreads -O3 -fno-strict-aliasing
+   CFLAGS := -g -Wall -mno-cygwin -m32 -mwin32 -mthreads -O3 -fno-strict-aliasing -Wno-unknown-pragmas
    LIBS_NETWORK := -lwsock32
    WIN_VERSION := 32
    BINDIR := $(BUILDDIR)/release32
@@ -58,6 +63,16 @@ else
    OBJDIR := obj32
 endif
 
+bat=@BAT@
+
+ifeq ($(bat),no)
+   BUILD_BAT=no
+else
+   BUILD_BAT=yes
+endif
+
+OBJDIRS := obj32 obj64
+
 LDFLAGS := -g -Wall -mno-cygwin -Wl,--disable-auto-import
 
 INCLUDE_DDK := -I$(MINGW_INCLUDE)/ddk