Merge branch 'master' into broadway

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e69d29337ca8218297dac0cc430bc8d1cb18e43b..d740dae1f74ce3a1180a03fa6354e58a392dbf9c 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -397,6 +397,7 @@ gtk_private_h_sources =             \
        gtkkeyhash.h            \
        gtkmenuprivate.h        \
        gtkmnemonichash.h       \
+       gtkmodifierstyle.h      \
        gtkmountoperationprivate.h \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
@@ -552,6 +553,7 @@ gtk_base_c_sources =            \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
+       gtkmodifierstyle.c      \
        gtkmodules.c            \
        gtkmountoperation.c     \
        gtknotebook.c           \
@@ -865,18 +867,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
+libgtk_broadway_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
 
+libgtk_broadway_3_0_la_LDFLAGS = $(libtool_opts)
 libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
 
+libgtk_broadway_3_0_la_LIBADD = $(libadd)
 libgtk_x11_3_0_la_LIBADD = $(libadd)
 libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_quartz_3_0_la_LIBADD = $(libadd)
 
+libgtk_broadway_3_0_la_DEPENDENCIES = $(deps)
 libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
 libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
@@ -884,7 +890,7 @@ libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
+EXTRA_LTLIBRARIES = libgtk-broadway-3.0.la libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS