diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-01-12 03:14:04 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-02-15 16:55:25 -0500 |
| commit | 7cbff954b926d97ce2f3ce08487866b668e7eafb (patch) | |
| tree | c12ed293bc988b77812a077146ab340f41cb41ca /gmodule | |
| parent | 08533cae05dfe6d3af5e02c95af9de65680cdae0 (diff) | |
| download | glib-7cbff954b926d97ce2f3ce08487866b668e7eafb.tar.gz | |
win32: fixup lib.exe invocation
We have a configure.ac check for lib.exe that attempts to enable
creation of .lib files for our 5 public libraries. That has been broken
for a long time for two reasons:
1) the Makefiles hardcode 'lib' instead of 'lib.exe'
2) we dropped generation of .def files quite some time ago (except for
in gthread where we have the two-symbol file under version control)
Add new rules for creating .def files from dumpbin.exe (which you should
have if you have lib.exe) and fix the .lib rules to use lib.exe.
Add a bit of $(AM_V_GEN) all around, as well.
https://bugzilla.gnome.org/show_bug.cgi?id=722033
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 85d37dbfa..95c7f0932 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -75,8 +75,11 @@ libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def) gmodule-win32-res.o: gmodule.rc $(AM_V_GEN) $(WINDRES) gmodule.rc $@ +gmodule.def: libgmodule-2.0.la + $(AM_V_GEN) dumpbin.exe -exports .libs/libgmodule-2.0-0.dll | awk 'BEGIN { print "EXPORTS" } / +[[:digit:]]+ +[[:xdigit:]]+ +[[:xdigit:]]+/{ print $$4 }' > gmodule.def.tmp && mv gmodule.def.tmp gmodule.def + 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:$(builddir)/gmodule.def -out:$@ + $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gmodule.def -out:$@ .PHONY: files release |