diff options
author | Tor Lillqvist <tml@novell.com> | 2005-07-09 00:33:40 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2005-07-09 00:33:40 +0000 |
commit | cde661031c455a7bb0f080179afd87cf0034eb17 (patch) | |
tree | f852d7b8f8143e2730baef3b768c5806b3e951ed /pango/Makefile.am | |
parent | 3a33257734c9e1304b9c76167399eea6d8dd7732 (diff) | |
download | pango-cde661031c455a7bb0f080179afd87cf0034eb17.tar.gz |
Call AC_CANONICAL_HOST before looking at $host. Check for windres on
2005-07-09 Tor Lillqvist <tml@novell.com>
* configure.in: Call AC_CANONICAL_HOST before looking at $host.
Check for windres on Win32.
* pango/Makefile.am: Don't use the scripts in GLib's build/win32
to compile the rc files into resource object files. (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.
Libtool installs/uninstalls the import libraries, no need to do it
ourselves. Do install/uninstall the .def files, though.
* pango/pango.rc.in
* pango/pangoft2.rc.in
* pango/pangowin32.rc.in: Correspondingly, use 0 instead of
BUILDNUMBER.
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index cf0748b5..1d20d1b9 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -50,12 +50,11 @@ libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la $(libm) libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la if OS_WIN32 -libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -libpango_1_0_la_LIBADD += pango-win32res.lo -libpango_1_0_la_DEPENDENCIES += pango-win32res.lo pango.def +libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o +libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def endif -pango-win32res.lo: pango.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ +pango-win32-res.o: pango.rc + $(WINDRES) $< $@ libpango_1_0_la_SOURCES = \ break.c \ @@ -189,12 +188,11 @@ libpangoft2_1_0_la_SOURCES = \ module-defs-fc.c if OS_WIN32 -libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -libpangoft2_1_0_la_LIBADD += pangoft2-win32res.lo -libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32res.lo pangoft2.def +libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o +libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def endif -pangoft2-win32res.lo: pangoft2.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ +pangoft2-win32-res.o: pangoft2.rc + $(WINDRES) $< $@ # ------------------- libpangoxft ------------------- @@ -269,30 +267,31 @@ libpangowin32_1_0_la_SOURCES = \ module-defs-win32.c if OS_WIN32 -libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -libpangowin32_1_0_la_LIBADD += pangowin32-win32res.lo -libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32res.lo pangowin32.def +libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o +libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32-res.o pangowin32.def endif -pangowin32-win32res.lo: pangowin32.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ +pangowin32-win32-res.o: pangowin32.rc + $(WINDRES) $< $@ # ------------------- win32 build stuff ------------------- if OS_WIN32 -install-libtool-import-lib: - $(INSTALL) .libs/libpango-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) +install-def-files: + $(INSTALL) pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def if HAVE_FREETYPE - $(INSTALL) .libs/libpangoft2-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) + $(INSTALL) pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def endif - $(INSTALL) .libs/libpangowin32-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libpango-$(PANGO_API_VERSION).dll.a - -rm $(DESTDIR)$(libdir)/libpangoft2-$(PANGO_API_VERSION).dll.a - -rm $(DESTDIR)$(libdir)/libpangowin32-$(PANGO_API_VERSION).dll.a + $(INSTALL) pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def +uninstall-def-files: + -rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def +if HAVE_FREETYPE + -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def +endif + -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-files: +uninstall-def-files: endif @@ -400,7 +399,7 @@ DISTCLEANFILES = \ module-defs-fc.c \ module-defs-win32.c -install-data-local: install-ms-lib install-libtool-import-lib +install-data-local: install-ms-lib install-def-files install-exec-hook: if DISABLE_EXPLICIT_DEPS @@ -409,4 +408,4 @@ if DISABLE_EXPLICIT_DEPS done endif -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +uninstall-local: uninstall-ms-lib uninstall-def-files |