Add check for db2html

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

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index afa9db5f02af3b6e2215b4bd6ded3f42f7b80df0..5c73ef3ad702efb4c73aefa75d5d0eb9664d6a71 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,12 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
+libgdkincludedir = $(includedir)/gdk
+libgdkx11includedir = $(includedir)/gdk/x11
+
 INCLUDES = @STRIP_BEGIN@       \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
+       -I$(top_builddir)/gdk   \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
        @GTK_LOCALE_FLAGS@      \
+       @PANGO_CFLAGS@          \
        @GLIB_CFLAGS@           \
        @x_cflags@              \
 @STRIP_END@
@@ -51,10 +56,9 @@ libgdk_x11_la_SOURCES =      \
        gdkimage-x11.c          \
        gdkinput.c              \
        gdkmain-x11.c           \
+       gdkpango-x11.c          \
        gdkpixmap-x11.c         \
        gdkproperty-x11.c       \
-       gdkpolyreg-generic.c    \
-       gdkregion-generic.c     \
        gdkselection-x11.c      \
        gdkvisual-x11.c         \
        gdkwindow-x11.c         \
@@ -67,17 +71,24 @@ libgdk_x11_la_SOURCES =     \
        gdkinputprivate.h       \
        $(xinput_sources)
 
-INCLUDE_HEADERS =              \
+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