diff options
| author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2012-03-17 23:10:01 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-03-17 23:10:01 -0400 |
| commit | e2b47ae9e0ff4402253c5ca854b3a5229513a12e (patch) | |
| tree | 29ae35eee5ea88c12a960b1ca8401021b8f6e648 /gmodule | |
| parent | 65d758859c8155362f8ffaebf5614a10d025f5a6 (diff) | |
Fix out of tree build for MinGW/MSYS
When building with MinGW/MSYS with srcdir != builddir the build fails:
- to locate the generated .def files
- creating libglib-gdb.py
- creating libgobject-gdb.py
Solved this by explicitly instructing these files to be generated
in $(builddir)/...
https://bugzilla.gnome.org/show_bug.cgi?id=653167
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 4eb5ed75f..5e08c1132 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DG_DISABLE_DEPRECATED gmodule.def: gmodule.symbols - $(AM_V_GEN) (echo EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > gmodule.def + $(AM_V_GEN) (echo EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > $(builddir)/gmodule.def EXTRA_DIST += \ makefile.msc.in \ @@ -61,14 +61,14 @@ no_undefined = -no-undefined endif if OS_WIN32_AND_DLL_COMPILATION -export_symbols = -export-symbols gmodule.def +export_symbols = -export-symbols $(builddir)/gmodule.def gmodule_def = gmodule.def gmodule_win32_res = gmodule-win32-res.o gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res) install-def-file: - $(INSTALL) gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def + $(INSTALL) $(builddir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gmodule-2.0.def @@ -92,7 +92,7 @@ gmodule-win32-res.o: gmodule.rc $(AM_V_GEN) $(WINDRES) gmodule.rc $@ gmodule-2.0.lib: libgmodule-2.0.la gmodule.def - lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@ + lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gmodule.def -out:$@ .PHONY: files release |