diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-07 16:40:02 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-07 16:40:02 +0000 |
| commit | a5b50542c5bd7e4a5487284af9ce3d40a36633f8 (patch) | |
| tree | a70df449f0f3a98acdd5428d79c98ab1bb34b012 /pango | |
| parent | 84940c514a6500ec4082ecdfe46df0278506dd16 (diff) | |
| download | pango-a5b50542c5bd7e4a5487284af9ce3d40a36633f8.tar.gz | |
subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables
2001-06-07 Havoc Pennington <hp@redhat.com>
* m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
GLIB_MKENUMS variables
* gmodule-2.0.pc.in: add gmodule_supported variable
* glib-2.0.pc.in: add glib_genmarshal, gobject_query,
glib_mkenums variables
* configure.in: put G_MODULE_SUPPORTED value into
.pc files
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
2001-06-07 Havoc Pennington <hp@redhat.com>
* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
other libs
* configure.in: use AM_PATH_GLIB_2_0
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: dist the .pc.in files
2001-06-07 Havoc Pennington <hp@redhat.com>
* atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
glib-genmarshal
* configure.in: rearrange the library checks to support
uninstalled linking
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* atk-uninstalled.pc.in: new file, allows linking to uninstalled
ATK in giant GTK tarball
2001-06-07 Havoc Pennington <hp@redhat.com>
* tests/Makefile.am: add missing -I flag
* gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc.
* configure.in: use pkg-config to see if GModule is
supported; fix to properly turn on included loaders
when GModule isn't supported; don't use AC_CHECK_LIB
when libs are not installed yet
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* Makefile.am (SUBDIRS): add m4macros subdir
* gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in
dependencies also.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 02d13254..6b2028bc 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -96,7 +96,7 @@ endif libpangox_la_LDFLAGS = -release $(VERSION) libpangox_la_LIBADD = $(INCLUDED_X_MODULES) $(X_LIBS) libpango.la -libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) +libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la libpangoxft_la_SOURCES = \ pangoxft-font.c \ @@ -106,7 +106,7 @@ libpangoxft_la_SOURCES = \ libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la libpango.la libpangoxft_la_LDFLAGS = -release $(VERSION) -libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) +libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la libpangoft2_la_SOURCES = \ pangoft2.h \ @@ -118,7 +118,7 @@ libpangoft2_la_SOURCES = \ libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) libpango.la libpangoft2_la_LDFLAGS = -release $(VERSION) -libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) +libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la pangoincludedir=$(includedir)/pango-1.0/pango |