Merge branch 'gtk-3-0' into broadway

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1e51edd02b4e3cbe062042aebff09e58042d059d..cc5346b0f878a1975380d346b7dd31a7ce8c9012 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -11,7 +11,7 @@ INTROSPECTION_COMPILER_ARGS = \
 
 SUBDIRS = $(GDK_BACKENDS) . tests
 
-DIST_SUBDIRS = win32 x11 quartz tests
+DIST_SUBDIRS = win32 x11 quartz broadway tests
 
 CLEANFILES =
 
@@ -92,10 +92,6 @@ gdk_public_h_sources =                               \
        gdkvisual.h                             \
        gdkwindow.h
 
-gdk_built_public_sources =                     \
-       gdkconfig.h                             \
-       gdkenumtypes.h
-
 gdk_private_headers =                          \
        gdkapplaunchcontextprivate.h            \
        gdkcursorprivate.h                      \
@@ -141,14 +137,15 @@ gdk_built_sources =                               \
        gdkenumtypes.c                          \
        gdkmarshalers.h                         \
        gdkmarshalers.c                         \
-       $(gdk_built_public_sources)
+       gdkenumtypes.h
 
 #
 # setup GDK sources and their dependencies
 #
 
 gdkincludedir = $(includedir)/gtk-3.0/gdk
-gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
+gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h
+nodist_gdkinclude_HEADERS = gdkconfig.h
 
 common_sources =               \
        $(gdk_private_headers)  \
@@ -176,6 +173,10 @@ libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.de
 libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
 endif # USE_WIN32
 
+if USE_BROADWAY
+libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+endif # USE_BROADWAY
+
 if HAVE_INTROSPECTION
 
 introspection_files =          \
@@ -225,7 +226,7 @@ x11_introspection_files =           \
        x11/gdkxid.c                    \
        x11/xsettings-client.c          \
        x11/xsettings-common.c          \
-        x11/gdkx.h                     \
+       x11/gdkx.h                      \
        x11/gdkx11cursor.h              \
        x11/gdkx11display.h             \
        x11/gdkx11property.h            \
@@ -301,14 +302,12 @@ lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += $(gdk_built_sources)
-EXTRA_HEADERS =
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
        $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
 endif
 
-#note: not gdkconfig.h
 BUILT_SOURCES = \
        $(gdk_built_sources)                    \
        gdkconfig.h