From bdd95132cd7a6d887195baa3139009def897e54c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertn@the-nelsons.org>
Date: Sat, 5 Aug 2006 19:55:35 +0000
Subject: [PATCH] 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
---
 bacula/src/win32/cats/Makefile       | 3 ++-
 bacula/src/win32/console/Makefile    | 3 ++-
 bacula/src/win32/dird/Makefile       | 3 ++-
 bacula/src/win32/dll/Makefile        | 5 +++--
 bacula/src/win32/filed/Makefile      | 3 ++-
 bacula/src/win32/stored/Makefile     | 3 ++-
 bacula/src/win32/tools/Makefile      | 3 ++-
 bacula/src/win32/wx-console/Makefile | 4 +++-
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile
index 39bb1dbcfe..19eab109ac 100644
--- 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 8d4b05744a..32dbbc6d6c 100644
--- 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 5a123f1036..019b67eec2 100644
--- 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 01c4ee6052..d645f1aa8b 100644
--- 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 5993565d53..8a2e4966c1 100644
--- 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 96d1feb773..6b5bc58d7c 100644
--- 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 31797e0f55..5fed371f58 100644
--- 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 0c2e6f236e..97e52838ea 100755
--- 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
 
 ##########################################################################
 
-- 
2.39.5