GtkImageCellAccessible: add a private struct

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

diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 5b16442ee814ee8d39a112a23180b0bf6419ba85..1bc1419efc4cec373c40ea81e977028ffa78c8de 100644 (file)
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -9,19 +9,21 @@ gail_c_sources =                      \
        gtkboxaccessible.c              \
        gtkbuttonaccessible.c           \
        gtkcellaccessible.c             \
-       gailcellparent.c                \
+       gtkcellaccessibleparent.c       \
        gtkcheckmenuitemaccessible.c    \
-       gtkchecksubmenuitemaccessible.c \
+       gtkcolorswatchaccessible.c      \
        gtkcomboboxaccessible.c         \
        gtkcontaineraccessible.c        \
        gtkcontainercellaccessible.c    \
        gtkentryaccessible.c            \
        gtkexpanderaccessible.c         \
        gtkframeaccessible.c            \
+       gtkiconviewaccessible.c         \
        gtkimageaccessible.c            \
        gtkimagecellaccessible.c        \
        gtklabelaccessible.c            \
        gtklinkbuttonaccessible.c       \
+       gtklockbuttonaccessible.c       \
        gtkmenuaccessible.c             \
        gtkmenushellaccessible.c        \
        gtkmenuitemaccessible.c         \
@@ -31,7 +33,6 @@ gail_c_sources =                      \
        gtkprogressbaraccessible.c      \
        gtkradiobuttonaccessible.c      \
        gtkradiomenuitemaccessible.c    \
-       gtkradiosubmenuitemaccessible.c \
        gtkrangeaccessible.c            \
        gtkrenderercellaccessible.c     \
        gtkscaleaccessible.c            \
@@ -41,7 +42,6 @@ gail_c_sources =                      \
        gtkspinbuttonaccessible.c       \
        gtkspinneraccessible.c          \
        gtkstatusbaraccessible.c        \
-       gtksubmenuitemaccessible.c      \
        gtkswitchaccessible.c           \
        gtktextcellaccessible.c         \
        gtktextviewaccessible.c         \
@@ -53,27 +53,28 @@ gail_c_sources =                    \
        gailutil.c                      \
        gailmisc.c
 
-libgailincludedir=$(includedir)/gail-3.0/gail
-
 gail_private_h_sources =               \
+       gail.h                          \
        gtkarrowaccessible.h            \
        gtkbooleancellaccessible.h      \
        gtkboxaccessible.h              \
        gtkbuttonaccessible.h           \
        gtkcellaccessible.h             \
-       gailcellparent.h                \
+       gtkcellaccessibleparent.h       \
        gtkcheckmenuitemaccessible.h    \
-       gtkchecksubmenuitemaccessible.h \
+       gtkcolorswatchaccessible.h      \
        gtkcomboboxaccessible.h         \
        gtkcontaineraccessible.h        \
        gtkcontainercellaccessible.h    \
        gtkentryaccessible.h            \
        gtkexpanderaccessible.h         \
        gtkframeaccessible.h            \
+       gtkiconviewaccessible.h         \
        gtkimageaccessible.h            \
        gtkimagecellaccessible.h        \
        gtklabelaccessible.h            \
        gtklinkbuttonaccessible.h       \
+       gtklockbuttonaccessible.h       \
        gtkmenuaccessible.h             \
        gtkmenushellaccessible.h        \
        gtkmenuitemaccessible.h         \
@@ -83,7 +84,6 @@ gail_private_h_sources =              \
        gtkprogressbaraccessible.h      \
        gtkradiobuttonaccessible.h      \
        gtkradiomenuitemaccessible.h    \
-       gtkradiosubmenuitemaccessible.h \
        gtkrangeaccessible.h            \
        gtkrenderercellaccessible.h     \
        gtkscaleaccessible.h            \
@@ -93,28 +93,21 @@ gail_private_h_sources =            \
        gtkspinbuttonaccessible.h       \
        gtkspinneraccessible.h          \
        gtkstatusbaraccessible.h        \
-       gtksubmenuitemaccessible.h      \
        gtkswitchaccessible.h           \
        gtktextcellaccessible.h         \
        gtktextviewaccessible.h         \
        gtktogglebuttonaccessible.h     \
        gtktoplevelaccessible.h         \
        gtktreeviewaccessible.h         \
+       gtkwidgetaccessible.h           \
        gtkwindowaccessible.h           \
        gailutil.h                      \
        gailmisc.h
 
-gail_public_h_sources =        \
-       gtkwidgetaccessible.h
-
 libgail_la_SOURCES =                   \
        $(gail_c_sources)               \
-       $(gail_public_h_sources)        \
        $(gail_private_h_sources)
 
-libgailinclude_HEADERS =               \
-       $(gail_public_h_sources)
-
 libgail_la_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
@@ -123,8 +116,6 @@ libgail_la_CPPFLAGS = \
        -I$(top_builddir)/gtk           \
        -DGTK_VERSION=\"$(GTK_VERSION)\"\
        -DGTK_COMPILATION               \
-       -DGDK_DISABLE_DEPRECATED        \
-       -DGTK_DISABLE_DEPRECATED        \
        $(AM_CPPFLAGS)
 
 libgail_la_CFLAGS = \
@@ -138,5 +129,38 @@ libgail_la_LIBADD =  \
 
 libgail_la_LDFLAGS =    \
         $(LDFLAGS)
+               
+dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
+
+../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
+       for F in $(libgail_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gtk\a11y\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgail.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
+       rm libgail.sourcefiles
+       
+../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
+       for F in $(libgail_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgail.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxprojin >$@
+       rm libgail.vs10.sourcefiles
+
+../../build/win32/vs10/libgail.vcxproj.filters: ../../build/win32/vs10/libgail.vcxproj.filtersin
+       for F in $(libgail_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgail.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxproj.filtersin >$@
+       rm libgail.vs10.sourcefiles.filters
+
 
 -include $(top_srcdir)/git.mk