gdk/Makefile.am rework so that only things that really need to be done

2002-03-06  Manish Singh  <yosh@gimp.org>

        * gdk/Makefile.am
        * gtk/Makefile.am: rework so that only things that really need to be
        done post install are in the hook

diff --git a/ChangeLog b/ChangeLog
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff..775cd96ad2f850951bdf8169532fc242ce32f47f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-03-06  Manish Singh  <yosh@gimp.org>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: rework so that only things that really need to be
+       done post install are in the hook
+
 2002-03-06  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
@@ -50,6 +56,7 @@ Tue Mar  5 22:16:58 2002  Owen Taylor  <otaylor@redhat.com>
        suprious "no" with --disable-modules.
 
 2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab,
        gdk_pointer_ungrab): Bypass calls to the grab/ungrab functions in
        gdkinput-win32.c, as they don't effectively do anything anyway.

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 989921298a909d1ad818e26f960778fe5e307a2d..510a942580a59eb78abfe6e0ec3ee20272ac6706 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -173,20 +173,17 @@ EXTRA_HEADERS =
 configexecincludedir = $(libdir)/gtk-2.0/include
 #configexecinclude_DATA = gdkconfig.h
 
-if DISABLE_EXPLICIT_DEPS
-sanitize-la: 
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
-else
-sanitize-la: 
-       @true
-endif
-
-install-exec-hook: gdkconfig.h sanitize-la
+install-exec-local: gdkconfig.h
        $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
        file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
        if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
        else $(INSTALL_DATA) gdkconfig.h $$file; fi
 
+install-exec-hook:
+if DISABLE_EXPLICIT_DEPS
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
+endif
+
 #note: not gdkconfig.h
 BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
 
@@ -205,7 +202,7 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-install-data-hook: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 955cdbb2a01ddaa14d599243b55399de898c6231..817a7bdacb76e966c7149c565a8ca3a1c5e2a03d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -563,7 +563,7 @@ if DISABLE_EXPLICIT_DEPS
 endif
 
 # Install a RC file for the default GTK+ theme, and key themes
-install-data-hook: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key