diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rwxr-xr-x | pango-zip.sh.in | 18 | ||||
| -rw-r--r-- | pango/Makefile.am | 11 |
4 files changed, 38 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2005-08-05 Tor Lillqvist <tml@novell.com> + + * pango-zip.sh.in: Add pangocairo files. Get the DLLs from "bin" + unconditionally, that's where libtool installs them since a long + time. + + * pango/Makefile.am (install-def-files, uninstall-def-files): + Install/uninstall also pangocairo .def and .lib files. + 2005-07-30 Hans Breuer <hans@breuer.org> * pango/makefile.msc : updated diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 019b5729..452cfdbe 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2005-08-05 Tor Lillqvist <tml@novell.com> + + * pango-zip.sh.in: Add pangocairo files. Get the DLLs from "bin" + unconditionally, that's where libtool installs them since a long + time. + + * pango/Makefile.am (install-def-files, uninstall-def-files): + Install/uninstall also pangocairo .def and .lib files. + 2005-07-30 Hans Breuer <hans@breuer.org> * pango/makefile.msc : updated diff --git a/pango-zip.sh.in b/pango-zip.sh.in index cbb37a7e..f055d414 100755 --- a/pango-zip.sh.in +++ b/pango-zip.sh.in @@ -6,17 +6,15 @@ ZIP=/tmp/pango-@PANGO_VERSION@-`date +%Y%m%d`.zip DEVZIP=/tmp/pango-dev-@PANGO_VERSION@-`date +%Y%m%d`.zip cd @prefix@ -DLLDIR=lib -[ -f bin/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin - rm $ZIP zip $ZIP -@ <<EOF bin/pango-querymodules.exe etc/pango/pango.aliases etc/pango/pango.modules -$DLLDIR/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -$DLLDIR/libpangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -$DLLDIR/libpangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +bin/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +bin/libpangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +bin/libpangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll +bin/libpangocairo-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll EOF zip $ZIP lib/pango/@PANGO_MODULE_VERSION@/modules/*.dll @@ -26,12 +24,18 @@ zip -r $DEVZIP -@ <<EOF include/pango-1.0 lib/libpango-@PANGO_API_VERSION@.dll.a lib/pango-@PANGO_API_VERSION@.lib +lib/pango-@PANGO_API_VERSION@.def lib/libpangoft2-@PANGO_API_VERSION@.dll.a lib/pangoft2-@PANGO_API_VERSION@.lib +lib/pangoft2-@PANGO_API_VERSION@.def lib/libpangowin32-@PANGO_API_VERSION@.dll.a lib/pangowin32-@PANGO_API_VERSION@.lib +lib/pangowin32-@PANGO_API_VERSION@.def +lib/pangocairo-@PANGO_API_VERSION@.lib +lib/pangocairo-@PANGO_API_VERSION@.def lib/pkgconfig/pango.pc -lib/pkgconfig/pangowin32.pc lib/pkgconfig/pangoft2.pc +lib/pkgconfig/pangowin32.pc +lib/pkgconfig/pangocairo.pc share/gtk-doc/html/pango EOF diff --git a/pango/Makefile.am b/pango/Makefile.am index da1734a8..e8c48941 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -279,12 +279,14 @@ if HAVE_FREETYPE $(INSTALL) $(srcdir)/pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def endif $(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def + $(INSTALL) $(srcdir)/pangocairo.def $(DESTDIR)$(libdir)/pangocairo-$(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 + -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def else install-def-files: uninstall-def-files: @@ -292,19 +294,21 @@ uninstall-def-files: endif if MS_LIB_AVAILABLE -noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib +noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib -install-ms-lib: +install-ms-lib: pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) if HAVE_FREETYPE $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) endif $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) + $(INSTALL) pangocairo-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) uninstall-ms-lib: -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib + -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib else install-ms-lib: uninstall-ms-lib: @@ -319,6 +323,9 @@ pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir) pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def lib -name:libpangowin32-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@ +pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def + lib -name:libpangocairo-$(PANGO_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@ + # ------------------- pango-querymodules ------------------- |