]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
gail: Move from modules/other/gail to gtk/a11y
[~andy/gtk] / gtk / Makefile.am
index 535ecc80b7713d7a764c34cc8200e11ccbbdfa3f..e1eeca304d305f46fb2841daf6fb6318a964e6c9 100644 (file)
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = . tests
+SUBDIRS = . a11y tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -108,7 +108,7 @@ endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
-       $(top_builddir)/gdk/libgdk-3.0.la       \
+       $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)
 deps =
 
@@ -241,6 +241,7 @@ gtk_public_h_sources =              \
        gtklayout.h             \
        gtklinkbutton.h         \
        gtkliststore.h          \
+       gtklockbutton.h         \
        gtkmain.h               \
        gtkmenu.h               \
        gtkmenubar.h            \
@@ -255,6 +256,7 @@ gtk_public_h_sources =              \
        gtknumerableicon.h      \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
+       gtkoverlay.h            \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
@@ -374,17 +376,22 @@ endif
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
-       gtk9slice.h             \
        gtkaccelgroupprivate.h  \
+       gtkaccessibleprivate.h  \
        gtkanimationdescription.h \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
        gtkappchooseronline.h   \
        gtkbindingsprivate.h    \
+       gtkborderimageprivate.h \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcellareaboxcontextprivate.h  \
+       gtkcontainerprivate.h   \
+       gtkcssparserprivate.h   \
        gtkcssproviderprivate.h \
+       gtkcssselectorprivate.h \
+       gtkcsstypesprivate.h    \
        gtkcustompaperunixdialog.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
@@ -396,6 +403,7 @@ gtk_private_h_sources =             \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
        gtkiconcache.h          \
+       gtkimageprivate.h       \
        gtkimcontextsimpleseqs.h \
        gtkintl.h               \
        gtkkeyhash.h            \
@@ -418,14 +426,18 @@ gtk_private_h_sources =           \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtkroundedboxprivate.h  \
        gtkscaleprivate.h       \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkselectionprivate.h   \
        gtksettingsprivate.h    \
+       gtkshadowprivate.h      \
        gtksizegroup-private.h  \
        gtksocketprivate.h      \
        gtkstylecontextprivate.h \
+       gtkstylepropertiesprivate.h \
+       gtkstylepropertyprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
@@ -435,6 +447,7 @@ gtk_private_h_sources =             \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
+       gtkthemingengineprivate.h \
        gtktimeline.h           \
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
@@ -447,7 +460,6 @@ gtk_private_h_sources =             \
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =           \
-       gtk9slice.c             \
        gtkquery.c              \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
@@ -477,6 +489,7 @@ gtk_base_c_sources =                \
        gtkbin.c                \
        gtkbindings.c           \
        gtkborder.c             \
+       gtkborderimage.c        \
        gtkbox.c                \
        gtkbuildable.c          \
        gtkbuilder.c            \
@@ -507,7 +520,10 @@ gtk_base_c_sources =               \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssparser.c          \
        gtkcssprovider.c        \
+       gtkcssselector.c        \
+       gtkcsstypes.c           \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
@@ -559,6 +575,7 @@ gtk_base_c_sources =                \
        gtklayout.c             \
        gtklinkbutton.c         \
        gtkliststore.c          \
+       gtklockbutton.c         \
        gtkmain.c               \
        gtkmarshalers.c         \
        gtkmenu.c               \
@@ -576,6 +593,7 @@ gtk_base_c_sources =                \
        gtknumerableicon.c      \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
+       gtkoverlay.c            \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpango.c              \
@@ -603,6 +621,7 @@ gtk_base_c_sources =                \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
+       gtkroundedbox.c         \
        gtkscale.c              \
        gtkscalebutton.c        \
        gtkscrollable.c         \
@@ -615,6 +634,7 @@ gtk_base_c_sources =                \
        gtksettings.c           \
        gtksizegroup.c          \
        gtksizerequest.c        \
+       gtkshadow.c             \
        gtkshow.c               \
        gtkspinbutton.c         \
        gtkspinner.c            \
@@ -623,6 +643,7 @@ gtk_base_c_sources =                \
        gtkstock.c              \
        gtkstylecontext.c       \
        gtkstyleproperties.c    \
+       gtkstyleproperty.c      \
        gtkstyleprovider.c      \
        gtkstyle.c              \
        gtkswitch.c             \
@@ -870,15 +891,15 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 
 gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
-         ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+         ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+         $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
 # target platform:
-lib_LTLIBRARIES = libgtk-3.0.la
+lib_LTLIBRARIES = libgtk-3.la
 
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
@@ -886,22 +907,21 @@ 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_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_3_0_la_LIBADD = $(libadd)
-libgtk_3_0_la_DEPENDENCIES = $(deps)
-
-#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+libgtk_3_la_SOURCES = $(gtk_c_sources)
+libgtk_3_la_LDFLAGS = $(libtool_opts)
+libgtk_3_la_LIBADD = $(libadd)
+libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-libgtk_3_0_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
-libgtk_3_0_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
+libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
 endif
 
 if USE_QUARTZ
@@ -915,7 +935,7 @@ install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
-dist-hook: ../build/win32/vs9/gtk.vcproj
+dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
 
 ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
        for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
@@ -926,6 +946,26 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
        done >libgtk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
        rm libgtk.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
+       rm libgtk.vs10.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+       rm libgtk.vs10.sourcefiles.filters
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
@@ -948,13 +988,13 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
+DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 
 TEST_DEPS = $(DEPS) immodules.cache
 
 LDADDS =                                                               \
-       libgtk-3.0.la                                                   \
-       $(top_builddir)/gdk/libgdk-3.0.la                               \
+       libgtk-3.la                                                     \
+       $(top_builddir)/gdk/libgdk-3.la                         \
        $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
@@ -965,7 +1005,7 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
 Gtk_3_0_gir_SCANNERFLAGS =                     \
        --add-include-path=$(top_builddir)/gdk  \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
@@ -973,13 +1013,13 @@ if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
-Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
                $(INCLUDES) \
                -UGDK_DISABLE_DEPRECATED \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.0.la
+Gtk_3_0_gir_LIBS = libgtk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir
@@ -1001,7 +1041,6 @@ bin_PROGRAMS = \
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
-endif
 
 if OS_WIN32
 
@@ -1034,6 +1073,7 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
         echo '</assembly>' ) >$@
 
 endif
+endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_3_0_LDADD = $(LDADDS)
@@ -1059,6 +1099,7 @@ STOCK_ICONS = \
        stock-icons/16/window-close.png                 \
        stock-icons/16/gtk-connect.png                  \
        stock-icons/16/gtk-convert.png                  \
+       stock-icons/16/edit-clear.png                   \
        stock-icons/16/edit-copy.png                    \
        stock-icons/16/edit-cut.png                     \
        stock-icons/16/edit-delete.png                  \
@@ -1066,7 +1107,7 @@ STOCK_ICONS = \
        stock-icons/16/gtk-disconnect.png               \
        stock-icons/16/gtk-edit.png                     \
        stock-icons/16/system-run.png                   \
-       stock-icons/16/document-x-generic.png           \
+       stock-icons/16/text-x-generic.png               \
        stock-icons/16/edit-find-replace.png            \
        stock-icons/16/edit-find.png                    \
        stock-icons/16/media-floppy.png                 \
@@ -1079,6 +1120,8 @@ STOCK_ICONS = \
        stock-icons/16/go-last-ltr.png                  \
        stock-icons/16/go-top.png                       \
        stock-icons/16/go-up.png                        \
+       stock-icons/16/gtk-caps-lock-warning.png        \
+       stock-icons/16/gtk-color-picker.png             \
        stock-icons/16/drive-harddisk.png               \
        stock-icons/16/help-contents.png                \
        stock-icons/16/go-home.png                      \
@@ -1106,6 +1149,10 @@ STOCK_ICONS = \
        stock-icons/16/network-idle.png                 \
        stock-icons/16/document-new.png                 \
        stock-icons/16/document-open.png                \
+       stock-icons/16/gtk-orientation-landscape.png    \
+       stock-icons/16/gtk-orientation-portrait.png     \
+       stock-icons/16/gtk-orientation-reverse-landscape.png \
+       stock-icons/16/gtk-orientation-reverse-portrait.png \
        stock-icons/16/gtk-page-setup.png               \
        stock-icons/16/edit-paste.png                   \
        stock-icons/16/gtk-preferences.png              \
@@ -1163,6 +1210,7 @@ STOCK_ICONS = \
        stock-icons/24/media-optical.png                \
        stock-icons/24/edit-clear.png                   \
        stock-icons/24/window-close.png                 \
+       stock-icons/24/gtk-caps-lock-warning.png        \
        stock-icons/24/gtk-color-picker.png             \
        stock-icons/24/gtk-connect.png                  \
        stock-icons/24/gtk-convert.png                  \
@@ -1172,7 +1220,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-disconnect.png               \
        stock-icons/24/gtk-edit.png                     \
        stock-icons/24/system-run.png                   \
-       stock-icons/24/document-x-generic.png           \
+       stock-icons/24/text-x-generic.png               \
        stock-icons/24/edit-find-replace.png            \
        stock-icons/24/edit-find.png                    \
        stock-icons/24/gtk-font.png                     \
@@ -1330,8 +1378,6 @@ stamp-icons: $(STOCK_ICONS)
           && $(LN_S) folder.png user-home.png                          \
           && $(RM) user-desktop.png                                    \
           && $(LN_S) folder.png user-desktop.png                       \
-          && $(RM) text-x-generic.png                                  \
-          && $(LN_S) document-x-generic.png text-x-generic.png         \
        ) done                                                          \
        && touch stamp-icons