From f60e216527a0972d8022ae7e1b836c3f1e96af12 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 6 Jul 2000 15:51:10 +0000 Subject: [PATCH] Patch from George Liebl to install all the headers in the right place. Thu Jul 6 11:27:44 2000 Owen Taylor * gdk/x11/Makefile.am: Patch from George Liebl to install all the headers in the right place. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/Makefile.am | 12 ++++++------ 8 files changed, 41 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb0993992f..9c5b011467 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bb0993992f..9c5b011467 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jul 6 11:27:44 2000 Owen Taylor + + * gdk/x11/Makefile.am: Patch from George Liebl to + install all the headers in the right place. + Tue Jul 4 13:13:01 BST 2000 Tony Gale * docs/faq/gtk-faq.sgml: Add remaining sections. Completes diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index c77e82bb08..7e3f090384 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in libgdkincludedir = $(includedir)/gdk +libgdkx11includedir = $(includedir)/gdk/x11 INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ @@ -73,14 +74,13 @@ libgdk_x11_la_SOURCES = \ libgdkinclude_HEADERS = \ gdkx.h +libgdkx11include_HEADERS = \ + gdkdrawable-x11.h \ + gdkwindow-x11.h \ + gdkpixmap-x11.h + EXTRA_PROGRAMS = gxid bin_PROGRAMS = @xinput_progs@ gxid_SOURCES = gxid.c gxid_LDADD = $(LDADDS) - -install-data-local: - $(mkinstalldirs) $(includedir)/gdk - $(INSTALL_DATA) $(srcdir)/gdkx.h $(includedir)/gdk - $(mkinstalldirs) $(includedir)/gdk/x11 - $(INSTALL_DATA) $(srcdir)/gdkprivate-x11.h $(includedir)/gdk/x11