diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-05-06 21:55:41 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-06 21:55:41 +0000 |
| commit | 629a0e14248812e55e9245bad9e01d9bc6bd2d0a (patch) | |
| tree | 4805be6ed3f1fab22e7f536861e8e4f896e63b2c /contrib | |
| parent | 2e58122c793a66f6241ff4bfe74e8966a043eeb3 (diff) | |
| download | gdk-pixbuf-629a0e14248812e55e9245bad9e01d9bc6bd2d0a.tar.gz | |
Patch from James Henstridge to update to automake-1.7 (#109542)
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 7 | ||||
| -rw-r--r-- | contrib/gdk-pixbuf-xlib/Makefile.am | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b834aad9d..371e5da36 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,8 +1,5 @@ +SUBDIRS = if USE_X11 -XDIRS=gdk-pixbuf-xlib -else -XDIRS= +SUBDIRS += gdk-pixbuf-xlib endif - -SUBDIRS=$(XDIRS) diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am index e07f8d59c..76d4199c8 100644 --- a/contrib/gdk-pixbuf-xlib/Makefile.am +++ b/contrib/gdk-pixbuf-xlib/Makefile.am @@ -1,20 +1,19 @@ lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la -INCLUDES = @STRIP_BEGIN@ \ +INCLUDES = \ -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_srcdir)/contrib \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ - @GDK_PIXBUF_XLIB_DEP_CFLAGS@ \ -@STRIP_END@ + $(GDK_PIXBUF_XLIB_DEP_CFLAGS) libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ -export-dynamic \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_VERSION_INFO) libgdk_pixbuf_xlib_2_0_la_LIBADD = \ - @GDK_PIXBUF_XLIB_DEP_LIBS@ + $(GDK_PIXBUF_XLIB_DEP_LIBS) libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ |