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 /demos/gtk-demo | |
| 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 'demos/gtk-demo')
| -rw-r--r-- | demos/gtk-demo/Makefile.am | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 0fac5d821..c12164382 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -4,27 +4,26 @@ democodedir=$(datadir)/gtk-2.0/demo ## These should be in the order you want them to appear in the ## demo app, which means alphabetized by demo title, not filename -demos = @STRIP_BEGIN@ \ - appwindow.c \ - button_box.c \ - changedisplay.c \ - colorsel.c \ - dialog.c \ - drawingarea.c \ - editable_cells.c \ - images.c \ - item_factory.c \ - list_store.c \ - menus.c \ - panes.c \ - pixbufs.c \ - sizegroup.c \ - stock_browser.c \ - textview.c \ - tree_store.c \ -@STRIP_END@ +demos = \ + appwindow.c \ + button_box.c \ + changedisplay.c \ + colorsel.c \ + dialog.c \ + drawingarea.c \ + editable_cells.c \ + images.c \ + item_factory.c \ + list_store.c \ + menus.c \ + panes.c \ + pixbufs.c \ + sizegroup.c \ + stock_browser.c \ + textview.c \ + tree_store.c -INCLUDES = @STRIP_BEGIN@ \ +INCLUDES = \ -DDEMOCODEDIR="\"$(democodedir)\"" \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ @@ -32,20 +31,18 @@ INCLUDES = @STRIP_BEGIN@ \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ - @GTK_DEP_CFLAGS@ \ -@STRIP_END@ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) DEPS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) -LDADDS = @STRIP_BEGIN@ \ +LDADDS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ -@STRIP_END@ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) bin_PROGRAMS = gtk-demo @@ -54,8 +51,8 @@ BUILT_SOURCES = demos.h EXTRA_DIST = \ $(IMAGEFILES) -demos.h: $(demos) geninclude.pl - (cd $(srcdir) && $(PERL) ./geninclude.pl $(demos) > demos.h) +demos.h: @REBUILD@ $(demos) geninclude.pl + (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h gtk_demo_SOURCES = \ $(demos) \ @@ -80,3 +77,5 @@ IMAGEFILES= alphatest.png \ gtk-logo-rgb.gif democode_DATA = $(demos) $(IMAGEFILES) + +DISTCLEANFILES = demos.h |