diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-07-08 23:04:06 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-07-08 23:04:06 +0000 |
| commit | d22f05125236c5386c67f72ccfb6dcef7f98907c (patch) | |
| tree | 299670cab65d4cf47c019460a5c2d2645f0f75db /gmodule | |
| parent | 352742b86ada2e25044e320f7d4b8c0855b35252 (diff) | |
Don't use autoconf variables for the resource object files on Win32 any
2005-07-09 Tor Lillqvist <tml@novell.com>
* configure.in: Don't use autoconf variables for the resource
object files on Win32 any longer. Instead handle that in the
Makefile.am files. Check for windres.
* glibconfig.h.win32.in: Minor tuning to match the
configure-produced glibconfig.h closely.
* */Makefile.am: Don't use the scripts in build/win32 to
compile the .rc file into a resource object file. (This means
we loose the build number increment magic, but I doubt it was
that useful anyway.) Instead use windres directly. To pass the
normal .o file produced by windres through libtool, which
wants .lo files, pass it directly to the linker using a -Wl
option.
* */*.rc.in: Thus replace BUILDNUMBER with 0.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 11 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 14 | ||||
| -rw-r--r-- | gmodule/gmodule.rc.in | 4 |
3 files changed, 23 insertions, 6 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index a9cc6476c..d130df3eb 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,14 @@ +2005-07-09 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Don't use the scripts in build/win32 to compile + gmodule.rc into a resource object file. (This means we loose the + build number increment magic, but I doubt it was that useful + anyway.) Instead use windres directly. To pass the normal .o file + produced by windres through libtool, which wants .lo files, pass + it directly to the linker using a -Wl option. + + * gmodule.rc.in: Thus replace BUILDNUMBER with 0. + 2005-07-08 Matthias Clasen <mclasen@redhat.com> * === Released 2.7.2 === diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 0c9cbbd90..d07325a37 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -64,19 +64,25 @@ install-def-file: uninstall-def-file: endif +if OS_WIN32 +gmodule_win32_res = gmodule-win32-res.o +gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res) +endif + libgmodule_2_0_la_SOURCES = gmodule.c libgmodule_2_0_la_LDFLAGS = \ + $(gmodule_win32_res_ldflag) \ $(G_MODULE_LDFLAGS) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgmodule_2_0_la_LIBADD = $(G_MODULE_WIN32_RESOURCE) $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) +libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) -libgmodule_2_0_la_DEPENDENCIES = $(G_MODULE_WIN32_RESOURCE) $(GMODULE_DEF) +libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(GMODULE_DEF) if OS_WIN32 -$(G_MODULE_WIN32_RESOURCE): gmodule.rc - $(top_srcdir)/build/win32/lt-compile-resource gmodule.rc $@ +gmodule-win32-res.o: gmodule.rc + $(WINDRES) gmodule.rc $@ endif gmodule-2.0.lib: libgmodule-2.0.la gmodule.def diff --git a/gmodule/gmodule.rc.in b/gmodule/gmodule.rc.in index 0a3ae0a83..cc4901446 100644 --- a/gmodule/gmodule.rc.in +++ b/gmodule/gmodule.rc.in @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,BUILDNUMBER + FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0 PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0 FILEFLAGSMASK 0 FILEFLAGS 0 @@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GModule" - VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" + VALUE "FileVersion", "@GLIB_VERSION@.0" VALUE "InternalName", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@" VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2004." VALUE "OriginalFilename", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll" |