diff options
author | Owen Taylor <otaylor@src.gnome.org> | 1998-03-14 23:14:58 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 1998-03-14 23:14:58 +0000 |
commit | 566a13a6c0a22b71dfa6fc3bdfc4a69649f0a55f (patch) | |
tree | 10f235660711fc2d62132d98f9c0c0ac884af365 | |
parent | 928028595464f11f07efa01aaf88f33aa5bf281d (diff) | |
download | gdk-pixbuf-566a13a6c0a22b71dfa6fc3bdfc4a69649f0a55f.tar.gz |
Makefile.am fixes minor fix to gdkwindow.c -owtGTK_0_99_6
Makefile.am fixes
minor fix to gdkwindow.c
-owt
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 11 | ||||
-rw-r--r-- | gdk/gdkwindow.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 | ||||
-rw-r--r-- | glib/ChangeLog | 5 | ||||
-rw-r--r-- | glib/Makefile.am | 2 | ||||
-rw-r--r-- | gtk/Makefile.am | 6 |
12 files changed, 88 insertions, 6 deletions
@@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 37a0c6c9d..543305027 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -5,6 +5,17 @@ Sat Mar 14 14:36:40 PST 1998 Shawn T. Amundson <amundson@gimp.org> * gdk/gtk_tut.sgml: * gdk/gtk_tut_it.sgml: fixed Ian Main's e-mail address +Sat Mar 14 17:48:42 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/Makefile.am: Don't refer to current directory as + $(top_builddir)/gtk to avoid confusing non-gmakes. Made + Emacs-dependent maintainer-oonly + +Sat Mar 14 17:47:12 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkwindow.c: (gdk_window_set_group): Fixed use of + unitialized variable. + Sat Mar 14 13:26:09 1998 Owen Taylor <owt1@cornell.edu> * gtk/gtkentry.c gtk/gtktext.c: Some cleanups of signedness diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 4d7531844..7f8a38ccd 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1818,7 +1818,7 @@ gdk_window_set_group (GdkWindow *window, return; private = (GdkWindowPrivate *)leader; - wm_hints.flags |= WindowGroupHint; + wm_hints.flags = WindowGroupHint; wm_hints.window_group = private->xwindow; XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 4d7531844..7f8a38ccd 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1818,7 +1818,7 @@ gdk_window_set_group (GdkWindow *window, return; private = (GdkWindowPrivate *)leader; - wm_hints.flags |= WindowGroupHint; + wm_hints.flags = WindowGroupHint; wm_hints.window_group = private->xwindow; XSetWMHints (window_private->xdisplay, window_private->xwindow, &wm_hints); diff --git a/glib/ChangeLog b/glib/ChangeLog index fd5914f1b..95669f799 100644 --- a/glib/ChangeLog +++ b/glib/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 14 17:47:43 1998 Owen Taylor <owt1@cornell.edu> + + * Makefile.am: Don't refer to current directory as $(top_builddir) + to avoid confusing non-gmakes + Sat Mar 14 01:37:35 1998 Owen Taylor <owt1@cornell.edu> * Makefile.am (configincludedir): Moved glibconfig.h to diff --git a/glib/Makefile.am b/glib/Makefile.am index cab45be7b..0fba3f63b 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -30,7 +30,7 @@ libglib_la_LDFLAGS = -version-info 1:0:0 INCLUDES = -I$(top_srcdir) noinst_PROGRAMS = testglib -testglib_LDADD = $(top_builddir)/libglib.la +testglib_LDADD = libglib.la .PHONY: files release diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 77160d1e5..d85cae191 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -191,10 +191,10 @@ gtkinclude_HEADERS = \ gtkwindow.h \ gtktypebuiltins.h -../gtk/gtktypebuiltins.h: gtk.defs gentypeinfo.el +$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el idmac $< $@ -gtktypebuiltins.c: gtk.defs gentypeinfo.el +$(srcdir)/gtktypebuiltins.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@ libgtk_la_LDFLAGS = -version-info 1:0:0 @@ -254,7 +254,7 @@ simple_LDADD = \ -lm DEPS = \ - $(top_builddir)/gtk/libgtk.la \ + libgtk.la \ $(top_builddir)/gdk/libgdk.la \ $(top_builddir)/glib/libglib.la |