Fix problem building the Windows version in the same tree as the Unix version.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3244 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile
index 39bb1dbcfe75ef1c6919cb2b48dcc3276354a55f..19eab109ac26e180e5f5e0ba50f2a6d258b4614f 100644 (file)
--- a/bacula/src/win32/cats/Makefile
+++ b/bacula/src/win32/cats/Makefile
@@ -17,7 +17,8 @@ INCLUDES = \
 DEFINES = \
        $(HAVES)
 
-VPATH = ../../cats
+vpath %.c ../../cats
+vpath %.cpp ../../cats
 
 ######################################################################
 

diff --git a/bacula/src/win32/console/Makefile b/bacula/src/win32/console/Makefile
index 8d4b05744a21e2a49534eea4464f04cdf243b203..32dbbc6d6c1f7385fb0de8206a62e2c433ae135e 100644 (file)
--- a/bacula/src/win32/console/Makefile
+++ b/bacula/src/win32/console/Makefile
@@ -16,7 +16,8 @@ DEFINES = \
        -DUSING_DLL \
        $(HAVES)
 
-VPATH = ../../console
+vpath %.c ../../console
+vpath %.cpp ../../console
 
 ##########################################################################
 

diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile
index 5a123f10361cc83732cd5f4df4f924364b7dca94..019b67eec2619c80ca88140f531f7f5c746215b1 100644 (file)
--- a/bacula/src/win32/dird/Makefile
+++ b/bacula/src/win32/dird/Makefile
@@ -19,7 +19,8 @@ DEFINES = \
        -DUSING_CATS \
        $(HAVES)
 
-VPATH = ../../dird
+vpath %.c ../../dird
+vpath %.cpp ../../dird
 
 ##########################################################################
 

diff --git a/bacula/src/win32/dll/Makefile b/bacula/src/win32/dll/Makefile
index 01c4ee6052d3969aaacd530b71aba84a809df9ef..d645f1aa8b8271277bcb7ef44f33429cb7fa1386 100644 (file)
--- a/bacula/src/win32/dll/Makefile
+++ b/bacula/src/win32/dll/Makefile
@@ -16,7 +16,8 @@ INCLUDES = \
 DEFINES = \
        $(HAVES)
 
-VPATH = ../compat ../../findlib ../../lib
+vpath %.c ../compat ../../findlib ../../lib
+vpath %.cpp ../compat ../../findlib ../../lib
 
 ######################################################################
 
@@ -141,7 +142,7 @@ $(LIBDIR)/libbacula.a: $(BINDIR)/bacula.dll $(STATIC_OBJS)
 
 $(BINDIR)/bacula.dll: DLL_DEFINE=BUILDING_DLL
 
-$(BINDIR)/bacula.dll: $(COMPAT_OBJS) $(DLL_OBJS) bacula.def
+$(BINDIR)/bacula.dll: $(DLL_OBJS) bacula.def
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/bacula.a $^ $(LIBS_DLL) -o $@

diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index 5993565d5346ee234cae184cdeeee9a18a5589e6..8a2e4966c10c76f4014c6968b32a52697e229b5f 100644 (file)
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -21,7 +21,8 @@ DEFINES = \
        -DWIN32_VSS \
        $(HAVES)
 
-VPATH = ../../filed ../libwin32
+vpath %.c ../../filed ../libwin32
+vpath %.cpp ../../filed ../libwin32
 
 ##########################################################################
 

diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index 96d1feb7735d3c252803f959f2a6e6a01e962cd8..6b5bc58d7c8f4d7da3871566e16ab86f0afa25db 100644 (file)
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -22,7 +22,8 @@ DEFINES = \
        -DUSING_DLL \
        $(HAVES)
 
-VPATH = ../../stored baculasd
+vpath %.c ../../stored baculasd
+vpath %.cpp ../../stored baculasd
 
 ##########################################################################
 

diff --git a/bacula/src/win32/tools/Makefile b/bacula/src/win32/tools/Makefile
index 31797e0f55fdce7a8afb0767755cbf83ee4085d8..5fed371f585a6cbe09af034d467d4d4449bff15b 100644 (file)
--- a/bacula/src/win32/tools/Makefile
+++ b/bacula/src/win32/tools/Makefile
@@ -19,7 +19,8 @@ DEFINES = \
        -DUSING_CATS \
        $(HAVES)
 
-VPATH = ../../tools ../../dird
+vpath %.c ../../tools ../../dird
+vpath %.cpp ../../tools ../../dird
 
 ##########################################################################
 

diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
index 0c2e6f236ecb03dca870ade6446ccf3d5b2fdc69..97e52838eab4ef4223cb2a1d0f871b4c183a49e6 100755 (executable)
--- a/bacula/src/win32/wx-console/Makefile
+++ b/bacula/src/win32/wx-console/Makefile
@@ -24,7 +24,9 @@ DEFINES = \
        -D_STAT_DEFINED \
        $(HAVES)
 
-VPATH = ../../wx-console
+vpath %.c ../../wx-console
+vpath %.cpp ../../wx-console
+vpath %.rc ../../wx-console
 
 ##########################################################################