diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-08-04 12:17:04 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-08-04 12:17:04 +0000 |
| commit | e8ae4824d6cc1eff50e73ccca3f8dc470c4d7123 (patch) | |
| tree | 35554f5cd1db06aafdc39caf0fbe50a82bf3606f | |
| parent | a4a2e843a78a7c0e97ad5a313f973b71ea657d6a (diff) | |
| download | atk-e8ae4824d6cc1eff50e73ccca3f8dc470c4d7123.tar.gz | |
Look for windres on Win32.
2005-08-04 Tor Lillqvist <tml@novell.com>
* configure.in: Look for windres on Win32.
* atk/Makefile.am: Don't use the script in GLib's build/win32 to
compile the rc file into a resource object file. (This means we
lose the build number increment magic, but I doubt it was that
useful anyway.) Instead use windres directly. To pass a normal .o
file produced by windres through libtool, which wants .lo files,
pass it directly to the linker using a -Wl option.
* atk/atk.rc.in: Correspondingly, replace BUILDNUMBER with 0.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | atk/Makefile.am | 24 | ||||
| -rw-r--r-- | atk/atk.rc.in | 4 | ||||
| -rw-r--r-- | configure.in | 5 |
4 files changed, 32 insertions, 14 deletions
@@ -1,3 +1,16 @@ +2005-08-04 Tor Lillqvist <tml@novell.com> + + * configure.in: Look for windres on Win32. + + * atk/Makefile.am: Don't use the script in GLib's build/win32 to + compile the rc file into a resource object file. (This means we + lose the build number increment magic, but I doubt it was that + useful anyway.) Instead use windres directly. To pass a normal .o + file produced by windres through libtool, which wants .lo files, + pass it directly to the linker using a -Wl option. + + * atk/atk.rc.in: Correspondingly, replace BUILDNUMBER with 0. + 2005-07-18 Abduxukur Abdurixit <abdurixit@gmail.com> * configure.in: Added 'ug' to ALL_LINGUAS. diff --git a/atk/Makefile.am b/atk/Makefile.am index 2de2629..f9bd6b3 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -130,20 +130,20 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile # ---------- Win32 stuff ---------- if OS_WIN32 -libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined -libatk_1_0_la_LIBADD += atk-win32res.lo +libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o +libatk_1_0_la_DEPENDENCIES = atk-win32-res.o -install-libtool-import-lib: - $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a +install-def-file: + $(INSTALL) $(srcdir)atk.def $(DESTDIR)$(libdir)/atk-1.0.def +uninstall-def-file: + -rm $(DESTDIR)$(libdir)/atk-1.0.def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-file: +uninstall-def-file: endif -atk-win32res.lo: atk.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ +atk-win32-res.o: atk.rc + $(WINDRES) $< $@ if MS_LIB_AVAILABLE noinst_DATA = atk-$(ATK_API_VERSION).lib @@ -173,6 +173,6 @@ distclean-local: rm -f atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c; \ fi -install-data-local: install-ms-lib install-libtool-import-lib +install-data-local: install-ms-lib install-def-file -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +uninstall-local: uninstall-ms-lib uninstall-def-file diff --git a/atk/atk.rc.in b/atk/atk.rc.in index bea0732..3bc0cb3 100644 --- a/atk/atk.rc.in +++ b/atk/atk.rc.in @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @ATK_MAJOR_VERSION@,@ATK_MINOR_VERSION@,@ATK_MICRO_VERSION@,BUILDNUMBER + FILEVERSION @ATK_MAJOR_VERSION@,@ATK_MINOR_VERSION@,@ATK_MICRO_VERSION@,0 PRODUCTVERSION @ATK_MAJOR_VERSION@,@ATK_MINOR_VERSION@,@ATK_MICRO_VERSION@,0 FILEFLAGSMASK 0 FILEFLAGS 0 @@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "Sun Microsystems Inc." VALUE "FileDescription", "atk" - VALUE "FileVersion", "@ATK_VERSION@.BUILDNUMBER" + VALUE "FileVersion", "@ATK_VERSION@.0" VALUE "InternalName", "libatk-1.0-@LT_CURRENT_MINUS_AGE@" VALUE "LegalCopyright", "Copyright © Sun Microsystems Inc." VALUE "OriginalFilename", "libatk-1.0-@LT_CURRENT_MINUS_AGE@.dll" diff --git a/configure.in b/configure.in index 8f8e54e..b9a097d 100644 --- a/configure.in +++ b/configure.in @@ -112,7 +112,12 @@ AC_MSG_RESULT([$atk_native_win32]) AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes") if test "$atk_native_win32" = "yes"; then + AC_CHECK_TOOL(WINDRES, windres, no) + if test "$WINDRES" = no; then + AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.]) + fi AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) + fi AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) |