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 /gthread | |
| 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 'gthread')
| -rw-r--r-- | gthread/ChangeLog | 11 | ||||
| -rw-r--r-- | gthread/Makefile.am | 14 | ||||
| -rw-r--r-- | gthread/gthread.rc.in | 4 |
3 files changed, 23 insertions, 6 deletions
diff --git a/gthread/ChangeLog b/gthread/ChangeLog index d47b1f119..bc056834a 100644 --- a/gthread/ChangeLog +++ b/gthread/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 + gthread.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. + + * gthread.rc.in: Thus replace BUILDNUMBER with 0. + 2005-07-08 Matthias Clasen <mclasen@redhat.com> * === Released 2.7.2 === diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 7f39f04fb..5f244ab66 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -53,18 +53,24 @@ install-def-file: uninstall-def-file: endif +if OS_WIN32 +gthread_win32_res = gthread-win32-res.o +gthread_win32_res_ldflag = -Wl,$(gthread_win32_res) +endif + libgthread_2_0_la_SOURCES = gthread-impl.c libgthread_2_0_la_LDFLAGS = \ + $(gthread_win32_res_ldflag) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgthread_2_0_la_LIBADD = $(G_THREAD_WIN32_RESOURCE) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(libglib) +libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(libglib) -libgthread_2_0_la_DEPENDENCIES = $(G_THREAD_WIN32_RESOURCE) $(GTHREAD_DEF) +libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(GTHREAD_DEF) if OS_WIN32 -$(G_THREAD_WIN32_RESOURCE): gthread.rc - $(top_srcdir)/build/win32/lt-compile-resource gthread.rc $@ +gthread-win32-res.o: gthread.rc + $(WINDRES) gthread.rc $@ endif gthread-2.0.lib: libgthread-2.0.la gthread.def diff --git a/gthread/gthread.rc.in b/gthread/gthread.rc.in index 3a9e2dad8..b70f87104 100644 --- a/gthread/gthread.rc.in +++ b/gthread/gthread.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", "GThread" - VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" + VALUE "FileVersion", "@GLIB_VERSION@.0" VALUE "InternalName", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@" VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2004." VALUE "OriginalFilename", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll" |