Merge branch 'gtk-3-0' into broadway

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f81147e062317cbc5b38eaac38e4c4a572390a1d..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)  \
@@ -157,25 +154,29 @@ common_sources =          \
        gdkmarshalers.c         \
        gdkmarshalers.h
 
-libgdk_3_0_la_SOURCES = $(common_sources)
-libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS)
-libgdk_3_0_la_LDFLAGS = $(LDADD)
+libgdk_3_la_SOURCES = $(common_sources)
+libgdk_3_la_LIBADD = $(GDK_DEP_LIBS)
+libgdk_3_la_LDFLAGS = $(LDADD)
 
 if USE_X11
-libgdk_3_0_la_LIBADD += x11/libgdk-x11.la
+libgdk_3_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_0_la_SOURCES += gdkkeynames.c
-libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_SOURCES += gdkkeynames.c
+libgdk_3_la_LIBADD += win32/libgdk-win32.la
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+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 =          \
@@ -184,11 +185,11 @@ introspection_files =             \
         gdkenumtypes.c         \
         gdkenumtypes.h
 
-Gdk-3.0.gir: libgdk-3.0.la Makefile
+Gdk-3.0.gir: libgdk-3.la Makefile
 Gdk_3_0_gir_SCANNERFLAGS =     \
        --c-include="gdk/gdk.h"
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = libgdk-3.0.la
+Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
 Gdk_3_0_gir_CFLAGS = $(INCLUDES)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
@@ -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            \
@@ -235,13 +236,13 @@ x11_introspection_files =                 \
        x11/gdkx11visual.h              \
        x11/gdkx11window.h
 
-GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
+GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
 GdkX11_3_0_gir_SCANNERFLAGS =          \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkx.h"        \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = libgdk-3.0.la
+GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
 GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
@@ -297,18 +298,16 @@ if OS_LINUX
 TESTS = abicheck.sh
 endif
 
-lib_LTLIBRARIES = libgdk-3.0.la
+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.0.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
 endif
 
-#note: not gdkconfig.h
 BUILT_SOURCES = \
        $(gdk_built_sources)                    \
        gdkconfig.h
@@ -349,7 +348,7 @@ stamp-gc-h: $(top_builddir)/config.status
 dist-hook: ../build/win32/vs9/gdk.vcproj
 
 ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
-       for F in $(libgdk_3_0_la_SOURCES); do \
+       for F in $(libgdk_3_la_SOURCES); do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
                     ;; \