pango r2669 - in trunk: . pango

[tml svn gnome org]

Author: tml
Date: Sun Aug  3 21:06:43 2008
New Revision: 2669
URL: http://svn.gnome.org/viewvc/pango?rev=2669&view=rev

Log:
2008-08-04  Tor Lillqvist  <tml novell com>

	* pango/Makefile.am: Don't attempt to build the MS import
	libraries for libpangoft2 unless HAVE_FREETYPE.



Modified:
   trunk/ChangeLog
   trunk/pango/Makefile.am

Modified: trunk/pango/Makefile.am
==============================================================================
--- trunk/pango/Makefile.am	(original)
+++ trunk/pango/Makefile.am	Sun Aug  3 21:06:43 2008
@@ -376,9 +376,15 @@
 endif
 
 if MS_LIB_AVAILABLE
-noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib
+MS_LIB_FILES = pango-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib
 
-install-ms-lib: pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib
+if HAVE_FREETYPE
+MS_LIB_FILES += pangoft2-$(PANGO_API_VERSION).lib 
+endif
+
+noinst_DATA = $(MS_LIB_FILES)
+
+install-ms-lib: $(MS_LIB_FILES)
 	$(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
 if HAVE_FREETYPE
 	$(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)