diff --git a/build/windows/gimprc-plug-ins.rule b/build/windows/gimprc-plug-ins.rule index 1f6af255e5..ade2452af9 100644 --- a/build/windows/gimprc-plug-ins.rule +++ b/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) $@ diff --git a/build/windows/gimprc.rule b/build/windows/gimprc.rule index 93d7e17568..9e35bf5b66 100644 --- a/build/windows/gimprc.rule +++ b/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) $@ diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 16d21ec72b..d1540d4b70 100644 --- a/libgimp/Makefile.am +++ b/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 diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index 4908cc6808..c97e68f08d 100644 --- a/libgimpbase/Makefile.am +++ b/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 diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 0bb71dfcf0..5f3dabc610 100644 --- a/libgimpcolor/Makefile.am +++ b/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 diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index 0b0d61d2c2..6c769263c4 100644 --- a/libgimpconfig/Makefile.am +++ b/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 diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am index 81db81dde0..be67ba8eee 100644 --- a/libgimpmath/Makefile.am +++ b/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 diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am index 0351aeb1bc..4a3bd5ecae 100644 --- a/libgimpmodule/Makefile.am +++ b/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 diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 27dd07cdf9..7e44ded8b7 100644 --- a/libgimpthumb/Makefile.am +++ b/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 diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 7ec1d6b564..bf1e95d2b9 100644 --- a/libgimpwidgets/Makefile.am +++ b/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 diff --git a/plug-ins/win-snap/Makefile.am b/plug-ins/win-snap/Makefile.am index bd4d654707..4d1f8d4213 100644 --- a/plug-ins/win-snap/Makefile.am +++ b/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