Makefile: fix VPATH builds for win32.

Author: Jehan

build/windows/gimprc-plug-ins.rule

@@ -1,10 +1,11 @@
 # Version resources for Microsoft Windows
 
-GIMPPLUGINRC = $(top_srcdir)/build/windows/gimp-plug-ins.rc
+GIMPPLUGINRC = $(top_builddir)/build/windows/gimp-plug-ins.rc
 
 %.rc.o:
 	$(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \
 		--define INTERNALNAME_STR="$*" \
 		--define TOP_SRCDIR="$(top_srcdir)" \
 		-I$(top_srcdir)/app \
+		-I$(top_builddir)/app \
 		$(GIMPPLUGINRC) $@

build/windows/gimprc.rule

@@ -1,10 +1,11 @@
 # Version resources for Microsoft Windows
 
-GIMPAPPRC = $(top_srcdir)/build/windows/gimp.rc
+GIMPAPPRC = $(top_builddir)/build/windows/gimp.rc
 
 %.rc.o: 
 	$(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \
 		--define INTERNALNAME_STR="$*" \
 		--define TOP_SRCDIR="$(top_srcdir)" \
 		-I$(top_srcdir)/app \
+		-I$(top_builddir)/app \
 		$(GIMPAPPRC) $@

libgimp/Makefile.am

@@ -19,14 +19,14 @@ endif
 if OS_WIN32
 gimp_def = gimp.def
 gimpui_def = gimpui.def
-libgimp_export_symbols = -export-symbols gimp.def
-libgimpui_export_symbols = -export-symbols gimpui.def
+libgimp_export_symbols = -export-symbols $(srcdir)/gimp.def
+libgimpui_export_symbols = -export-symbols $(srcdir)/gimpui.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimp-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
 	$(INSTALL) .libs/libgimpui-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimp.def $(DESTDIR)$(libdir)
-	$(INSTALL) gimpui.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimp.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpui.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimp-$(GIMP_API_VERSION).dll.a

libgimpbase/Makefile.am

@@ -12,11 +12,11 @@ endif
 if OS_WIN32
 ole32_lib = -lole32
 gimpbase_def = gimpbase.def
-libgimpbase_export_symbols = -export-symbols gimpbase.def
+libgimpbase_export_symbols = -export-symbols $(srcdir)/gimpbase.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpbase-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpbase.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpbase.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpbase-$(GIMP_API_VERSION).dll.a

libgimpcolor/Makefile.am

@@ -13,11 +13,11 @@ endif
 
 if OS_WIN32
 gimpcolor_def = gimpcolor.def
-libgimpcolor_export_symbols = -export-symbols gimpcolor.def
+libgimpcolor_export_symbols = -export-symbols $(srcdir)/gimpcolor.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpcolor-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpcolor.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpcolor.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpcolor-$(GIMP_API_VERSION).dll.a

libgimpconfig/Makefile.am

@@ -10,11 +10,11 @@ endif
 
 if OS_WIN32
 gimpconfig_def = gimpconfig.def
-libgimpconfig_export_symbols = -export-symbols gimpconfig.def
+libgimpconfig_export_symbols = -export-symbols $(srcdir)/gimpconfig.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpconfig-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpconfig.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpconfig.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpconfig-$(GIMP_API_VERSION).dll.a

libgimpmath/Makefile.am

@@ -13,11 +13,11 @@ endif
 
 if OS_WIN32
 gimpmath_def = gimpmath.def
-libgimpmath_export_symbols = -export-symbols gimpmath.def
+libgimpmath_export_symbols = -export-symbols $(srcdir)/gimpmath.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpmath-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpmath.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpmath.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpmath-$(GIMP_API_VERSION).dll.a

libgimpmodule/Makefile.am

@@ -9,11 +9,11 @@ endif
 
 if OS_WIN32
 gimpmodule_def = gimpmodule.def
-libgimpmodule_export_symbols = -export-symbols gimpmodule.def
+libgimpmodule_export_symbols = -export-symbols $(srcdir)/gimpmodule.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpmodule-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpmodule.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpmodule.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpmodule-$(GIMP_API_VERSION).dll.a

libgimpthumb/Makefile.am

@@ -11,11 +11,11 @@ endif
 
 if OS_WIN32
 gimpthumb_def = gimpthumb.def
-libgimpthumb_export_symbols = -export-symbols gimpthumb.def
+libgimpthumb_export_symbols = -export-symbols $(srcdir)/gimpthumb.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpthumb-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpthumb.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpthumb.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpthumb-$(GIMP_API_VERSION).dll.a

libgimpwidgets/Makefile.am

@@ -15,11 +15,11 @@ endif
 
 if OS_WIN32
 gimpwidgets_def = gimpwidgets.def
-libgimpwidgets_export_symbols = -export-symbols gimpwidgets.def
+libgimpwidgets_export_symbols = -export-symbols $(srcdir)/gimpwidgets.def
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgimpwidgets-$(GIMP_API_VERSION).dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) gimpwidgets.def $(DESTDIR)$(libdir)
+	$(INSTALL) $(srcdir)/gimpwidgets.def $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgimpwidgets-$(GIMP_API_VERSION).dll.a

plug-ins/win-snap/Makefile.am

@@ -45,4 +45,4 @@ LDADD = \
 	$(INTLLIBS)
 
 winsnap-win32res.o: winsnap.rc select.cur small.ico winsnap.ico
-	$(WINDRES) winsnap.rc winsnap-win32res.o
+	$(WINDRES) $(srcdir)/winsnap.rc winsnap-win32res.o