Merge branch 'master' into broadway

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index edbe7f58c45e9acbc0da90a8f917b6fb9cce10ef..d740dae1f74ce3a1180a03fa6354e58a392dbf9c 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -167,6 +167,7 @@ gtk_public_h_sources =          \
        gtkbbox.h               \
        gtkbin.h                \
        gtkbindings.h           \
+       gtkborder.h             \
        gtkbox.h                \
        gtkbuilder.h            \
        gtkbuildable.h          \
@@ -179,7 +180,7 @@ gtk_public_h_sources =          \
        gtkcellrenderercombo.h  \
        gtkcellrendererpixbuf.h \
        gtkcellrendererprogress.h \
-       gtkcellrendererspin.h   \
+       gtkcellrendererspin.h   \
        gtkcellrendererspinner.h\
        gtkcellrenderertext.h   \
        gtkcellrenderertoggle.h \
@@ -193,26 +194,28 @@ gtk_public_h_sources =          \
        gtkcombobox.h           \
        gtkcomboboxtext.h       \
        gtkcontainer.h          \
-       gtkdebug.h              \
+       gtkcssprovider.h        \
+       gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
        gtkdrawingarea.h        \
-       gtkeditable.h           \
+       gtkeditable.h           \
        gtkentry.h              \
        gtkentrybuffer.h        \
        gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
        gtkexpander.h           \
-       gtkfilechooser.h        \
-       gtkfilechooserbutton.h  \
-       gtkfilechooserdialog.h  \
-       gtkfilechooserwidget.h  \
+       gtkfilechooser.h        \
+       gtkfilechooserbutton.h  \
+       gtkfilechooserdialog.h  \
+       gtkfilechooserwidget.h  \
        gtkfilefilter.h         \
        gtkfixed.h              \
        gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
+       gtkgradient.h           \
        gtkgrid.h               \
        gtkhandlebox.h          \
        gtkhbbox.h              \
@@ -234,7 +237,7 @@ gtk_public_h_sources =          \
        gtkinfobar.h            \
        gtkinvisible.h          \
        gtklabel.h              \
-       gtklayout.h             \
+       gtklayout.h             \
        gtklinkbutton.h         \
        gtkliststore.h          \
        gtkmain.h               \
@@ -246,7 +249,7 @@ gtk_public_h_sources =          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
        gtkmodules.h            \
-       gtkmountoperation.h     \
+       gtkmountoperation.h     \
        gtknotebook.h           \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
@@ -256,7 +259,7 @@ gtk_public_h_sources =          \
        gtkplug.h               \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
-       gtkprintoperationpreview.h      \
+       gtkprintoperationpreview.h \
        gtkprintsettings.h      \
        gtkprogressbar.h        \
        gtkradioaction.h        \
@@ -268,13 +271,13 @@ gtk_public_h_sources =          \
        gtkrecentaction.h       \
        gtkrecentchooser.h      \
        gtkrecentchooserdialog.h \
-       gtkrecentchoosermenu.h  \
+       gtkrecentchoosermenu.h  \
        gtkrecentchooserwidget.h \
-       gtkrecentfilter.h       \
+       gtkrecentfilter.h       \
        gtkrecentmanager.h      \
        gtkscale.h              \
        gtkscalebutton.h        \
-       gtkscrollable.h         \
+       gtkscrollable.h         \
        gtkscrollbar.h          \
        gtkscrolledwindow.h     \
        gtkselection.h          \
@@ -292,12 +295,13 @@ gtk_public_h_sources =          \
        gtkstatusicon.h         \
        gtkstock.h              \
        gtkstylecontext.h       \
+       gtkstyleproperties.h    \
        gtkstyleprovider.h      \
-       gtkstyleset.h           \
        gtkstyle.h              \
        gtkswitch.h             \
+       gtksymboliccolor.h      \
        gtktable.h              \
-       gtktearoffmenuitem.h    \
+       gtktearoffmenuitem.h    \
        gtktestutils.h          \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
@@ -308,6 +312,7 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
+       gtkthemingengine.h      \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
@@ -369,12 +374,14 @@ endif
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       gtk9slice.h             \
        gtkbuttonprivate.h      \
        gtkquery.h              \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
+       gtkanimationdescription.h \
        gtkbuilderprivate.h     \
        gtkcustompaperunixdialog.h\
        gtkfilechooserdefault.h \
@@ -390,6 +397,7 @@ gtk_private_h_sources =             \
        gtkkeyhash.h            \
        gtkmenuprivate.h        \
        gtkmnemonichash.h       \
+       gtkmodifierstyle.h      \
        gtkmountoperationprivate.h \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
@@ -415,6 +423,7 @@ gtk_private_h_sources =             \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
+       gtktimeline.h           \
        gtkthemes.h             \
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
@@ -426,6 +435,7 @@ gtk_private_h_sources =             \
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =            \
+       gtk9slice.c             \
        gtkquery.c              \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
@@ -447,12 +457,14 @@ gtk_base_c_sources =            \
        gtkappchoosermodule.c   \
        gtkappchooseronline.c   \
        gtkapplication.c        \
+       gtkanimationdescription.c \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
        gtkbbox.c               \
        gtkbin.c                \
        gtkbindings.c           \
+       gtkborder.c             \
        gtkbox.c                \
        gtkbuildable.c          \
        gtkbuilder.c            \
@@ -479,9 +491,10 @@ gtk_base_c_sources =            \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssprovider.c        \
        gtkdialog.c             \
        gtkdrawingarea.c        \
-       gtkeditable.c           \
+       gtkeditable.c           \
        gtkentry.c              \
        gtkentrybuffer.c        \
        gtkentrycompletion.c    \
@@ -499,9 +512,10 @@ gtk_base_c_sources =            \
        gtkfilesystem.c         \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
-       gtkfontbutton.c         \
-       gtkfontsel.c            \
+       gtkfontbutton.c         \
+       gtkfontsel.c            \
        gtkframe.c              \
+       gtkgradient.c           \
        gtkgrid.c               \
        gtkhandlebox.c          \
        gtkhbbox.c              \
@@ -539,8 +553,9 @@ gtk_base_c_sources =            \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
+       gtkmodifierstyle.c      \
        gtkmodules.c            \
-       gtkmountoperation.c     \
+       gtkmountoperation.c     \
        gtknotebook.c           \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
@@ -552,7 +567,7 @@ gtk_base_c_sources =            \
        gtkplug.c               \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
-       gtkprintoperationpreview.c      \
+       gtkprintoperationpreview.c \
        gtkprintsettings.c      \
        gtkprintutils.c         \
        gtkprogressbar.c        \
@@ -561,20 +576,20 @@ gtk_base_c_sources =            \
        gtkradiomenuitem.c      \
        gtkradiotoolbutton.c    \
        gtkrange.c              \
-       gtkrbtree.c             \
+       gtkrbtree.c             \
        gtkrc.c                 \
        gtkrecentaction.c       \
        gtkrecentchooserdefault.c \
-       gtkrecentchooserdialog.c \
-       gtkrecentchoosermenu.c  \
-       gtkrecentchooserwidget.c \
+       gtkrecentchooserdialog.c\
+       gtkrecentchoosermenu.c  \
+       gtkrecentchooserwidget.c\
        gtkrecentchooserutils.c \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
        gtkscale.c              \
        gtkscalebutton.c        \
-       gtkscrollable.c         \
+       gtkscrollable.c         \
        gtkscrollbar.c          \
        gtkscrolledwindow.c     \
        gtkselection.c          \
@@ -592,12 +607,13 @@ gtk_base_c_sources =            \
        gtkstatusicon.c         \
        gtkstock.c              \
        gtkstylecontext.c       \
+       gtkstyleproperties.c    \
        gtkstyleprovider.c      \
-       gtkstyleset.c           \
        gtkstyle.c              \
        gtkswitch.c             \
+       gtksymboliccolor.c      \
        gtktable.c              \
-       gtktearoffmenuitem.c    \
+       gtktearoffmenuitem.c    \
        gtktestutils.c          \
        gtktextbtree.c          \
        gtktextbuffer.c         \
@@ -615,13 +631,15 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
+       gtkthemingengine.c      \
+       gtktimeline.c           \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
-       gtktoolitemgroup.c              \
+       gtktoolitemgroup.c      \
        gtktoolpalette.c        \
        gtktoolshell.c          \
        gtktooltip.c            \
@@ -648,7 +666,7 @@ gtk_base_c_sources =            \
        gtkvseparator.c         \
        gtkwidget.c             \
        gtkwidgetpath.c         \
-       gtkwindow-decorate.c    \
+       gtkwindow-decorate.c    \
        gtkwindow.c             \
        $(gtk_clipboard_dnd_c_sources) \
        $(gtk_appchooser_impl_c_sources)
@@ -849,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)
@@ -868,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