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 /modules | |
| parent | 2e58122c793a66f6241ff4bfe74e8966a043eeb3 (diff) | |
| download | gtk+-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 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index cb931f4f37..3deeeb896b 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -4,7 +4,7 @@ if PLATFORM_WIN32 no_undefined = -no-undefined endif -INCLUDES = @STRIP_BEGIN@ \ +INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ @@ -12,22 +12,20 @@ INCLUDES = @STRIP_BEGIN@ \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ - @GTK_XIM_FLAGS@ \ - @GTK_DEP_CFLAGS@ \ -@STRIP_END@ + $(GTK_DEBUG_FLAGS) \ + $(GTK_XIM_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@ \ - @GTK_DEP_LIBS@ \ -@STRIP_END@ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(GTK_DEP_LIBS) moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules @@ -100,6 +98,9 @@ install-data-local: echo "***" ; \ fi +uninstall-local: + rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules + module_LTLIBRARIES = \ $(IM_XIM_MODULE) \ im-am-et.la \ @@ -115,6 +116,8 @@ module_LTLIBRARIES = \ gtk.immodules: Makefile.am $(module_LTLIBRARIES) $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules +CLEANFILES = gtk.immodules + if CROSS_COMPILING else all-local: gtk.immodules |