Fix some trivial errors and implemented the restore of IRIX xattrs.

[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 e65b83733b88a5f1d14fd5c926e38aa3ff8f7d4d..c0e5f9bcb57639456ce0d983dd6ac0657775d837 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -48,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
@@ -63,6 +63,14 @@ 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
@@ -78,44 +86,44 @@ INCLUDE_WX := -I$(DEPKGS)/lib/wx_dll/msw -I$(DEPKGS)/include
 INCLUDE_MYSQL := -I$(DEPKGS)/include/mysql
 
 LIBS_DB := \
-       $(DEPKGS)/lib/libdb.a
+        $(DEPKGS)/lib/libdb.a
 
 LIBS_PTHREADS := \
-       $(DEPKGS)/lib/libpthreadGCE.a
+        $(DEPKGS)/lib/libpthreadGCE.a
 
 LIBS_ZLIB := \
-       $(DEPKGS)/lib/libz.a
+        $(DEPKGS)/lib/libz.a
 
 LIBS_MYSQL := \
-       $(DEPKGS)/lib/libmysql.a
+        $(DEPKGS)/lib/libmysql.a
 
 LIBS_POSTGRESQL := \
-       $(DEPKGS)/lib/libpq.a
+        $(DEPKGS)/lib/libpq.a
 
 LIBS_SQLITE := \
-       $(DEPKGS)/lib/libsqlite3.a
+        $(DEPKGS)/lib/libsqlite3.a
 
 LIBS_SSL := \
-       $(DEPKGS)/lib/libssl.dll.a
+        $(DEPKGS)/lib/libssl.dll.a
 
 LIBS_CRYPTO := \
-       $(DEPKGS)/lib/libcrypto.dll.a
+        $(DEPKGS)/lib/libcrypto.dll.a
 
 LIBS_WX := \
-       $(DEPKGS)/lib/wx_dll/libwxmsw28_core.a \
-       $(DEPKGS)/lib/wx_dll/libwxbase28.a
+        $(DEPKGS)/lib/wx_dll/libwxmsw28_core.a \
+        $(DEPKGS)/lib/wx_dll/libwxbase28.a
 
 LIBS_CATS := \
-       $(LIBDIR)/libcats.a
+        $(LIBDIR)/libcats.a
 
 LIBS_BACULA := \
-       $(LIBDIR)/libbacula.a
+        $(LIBDIR)/libbacula.a
 
 HAVES := \
-       -DHAVE_WIN32 \
-       -DHAVE_MINGW \
-       -DHAVE_ZLIB_H \
-       -DHAVE_LIBZ \
-       -DHAVE_CRYPTO \
-       -DHAVE_OPENSSL \
-       -DHAVE_TLS
+        -DHAVE_WIN32 \
+        -DHAVE_MINGW \
+        -DHAVE_ZLIB_H \
+        -DHAVE_LIBZ \
+        -DHAVE_CRYPTO \
+        -DHAVE_OPENSSL \
+        -DHAVE_TLS