Add check for db2html

[~andy/gtk] / gdk / x11 / Makefile.am

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index c77e82bb08a59bdff158a324423cfd59ab61afe9..5c73ef3ad702efb4c73aefa75d5d0eb9664d6a71 100644 (file)
--- 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,21 @@ 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
+# We need to include all these C files here since the conditionals
+# don't seem to be correctly expanded for the dist files.
+EXTRA_DIST =                   \
+       gdkinput-x11.c          \
+       gdkinput-xfree.c        \
+       gdkinput-gxi.c          \
+       gdkinput-none.c