Move `gtkfeature.h' ... (gtkinclude_HEADERS): ... here. (gtk.defs): Pass

* gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
(gtkinclude_HEADERS): ... here.
(gtk.defs): Pass `g' flag to sed, to replace all occurances.

diff --git a/ChangeLog b/ChangeLog
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ec86f324d67f1935cdf1fc6ee3a81b8e3cfd975..40f84da78689edd4156aeca4e6e1d05525af98d6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1998-09-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (source_headers): Move `gtkfeature.h' ...
+       (gtkinclude_HEADERS): ... here.
+       (gtk.defs): Pass `g' flag to sed, to replace all occurances.
+
 Thu Sep 17 10:49:51 1998  Raph Levien  <raph@gimp.org>
 
        * HACKING: added GNU indent, as it is now required to successfully
@@ -39,7 +45,6 @@ Thu Sep 17 05:12:48 1998  Tim Janik  <timj@gtk.org>
        -- the widget argument is NULL for the first radio button in the
        group.
 
->>>>>>> 1.636
 Tue Sep 15 13:09:24 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkimage.c (gdk_image_new): Reverted global changes

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 89e6fd50af5e54095816d6228b1369591f9b3135..0374d33981ad85e1607fd6c913eb6b327dace78b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -138,7 +138,6 @@ source_headers = \
        gtkentry.h              \
        gtkenums.h              \
        gtkeventbox.h           \
-       gtkfeatures.h           \
        gtkfilesel.h            \
        gtkfixed.h              \
        gtkfontsel.h            \
@@ -214,6 +213,7 @@ source_headers = \
 
 gtkinclude_HEADERS =           \
        $(source_headers)       \
+       gtkfeatures.h           \
        gtkmarshal.h            \
        gtktypebuiltins.h
 
@@ -232,7 +232,7 @@ gdk_headers = \
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
 gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
-       src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
+       src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%g` ; \
        srcdir=$(srcdir) \
          perl $(srcdir)/makeenums.pl defs $$src_headers \
                $(gdk_headers) > gd.tmp