diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-07 16:40:01 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-07 16:40:01 +0000 |
| commit | 5aba82da8ffda12f94ef2064b2eb296a9fd5fb60 (patch) | |
| tree | a840d9f1895e0cc8db4f559ebc116b4c52f6fee7 /Makefile.am | |
| parent | 2d18f2f420b165b6c52f320185cd276ef2e56835 (diff) | |
| download | gtk+-5aba82da8ffda12f94ef2064b2eb296a9fd5fb60.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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 658560b296..2d33584c70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for GTK+ SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -SUBDIRS = po $(SRC_SUBDIRS) docs build +SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros # require automake 1.4 AUTOMAKE_OPTIONS = 1.4 @@ -9,7 +9,6 @@ AUTOMAKE_OPTIONS = 1.4 EXTRA_DIST = \ HACKING \ gtk+.spec.in \ - gtk-2.0.m4 \ makecopyright \ TODO \ TODO.xml \ @@ -127,6 +126,14 @@ gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc rm -f gdk-$(GDKTARGET)-2.0.pc && \ cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc +gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc + rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \ + cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc + +gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc + rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \ + cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc @@ -151,9 +158,6 @@ dist-hook: gtk+.spec fi \ && cp gtk+.spec $(distdir) -m4datadir = $(datadir)/aclocal -m4data_DATA = gtk-2.0.m4 - .PHONY: files release sanity snapshot files: |