text: Deprecate atk_text_get_text_{before,after}_offset()

[platform/upstream/atk.git] / atk / Makefile.am

diff --git a/atk/Makefile.am b/atk/Makefile.am
index 5f0d617..4c79fe4 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -57,7 +57,9 @@ atk_sources =         \
        atktext.c               \
        atkutil.c               \
        atkmisc.c               \
-       atkvalue.c
+       atkvalue.c              \
+       atkversion.c            \
+       atkwindow.c
 
 libatk_1_0_la_SOURCES =        \
        $(atk_sources)          \
@@ -66,7 +68,6 @@ libatk_1_0_la_SOURCES =       \
 libatkincludedir=$(includedir)/atk-1.0/atk
 
 atk_headers = \
-        atk.h                  \
         atkaction.h            \
         atkcomponent.h         \
         atkdocument.h          \
@@ -94,10 +95,13 @@ atk_headers = \
         atktext.h              \
         atkutil.h              \
         atkmisc.h              \
-        atkvalue.h
+        atkvalue.h \
+        atkwindow.h
 
 libatkinclude_HEADERS =                \
+        atk.h                  \
        $(atk_headers)          \
+       $(top_builddir)/atk/atkversion.h \
        atk-enum-types.h
 
 
@@ -154,6 +158,7 @@ introspection_sources = \
     $(atk_headers)     \
     $(atk_sources)
 introspection_generated_sources = \
+    $(top_builddir)/atk/atkversion.h   \
     atk-enum-types.c   \
     atk-enum-types.h
 
@@ -161,7 +166,7 @@ Atk-1.0.gir: libatk-1.0.la Makefile
 Atk_1_0_gir_INCLUDES = GObject-2.0
 Atk_1_0_gir_CFLAGS = $(INCLUDES)
 Atk_1_0_gir_LIBS = libatk-1.0.la
-Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk
+Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h"
 Atk_1_0_gir_FILES = \
     $(addprefix $(srcdir)/, $(introspection_sources))  \
     $(introspection_generated_sources)
@@ -179,11 +184,11 @@ endif
 # ---------- Win32 stuff ----------
 
 if OS_WIN32
-libatk_1_0_la_LDFLAGS += -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
+libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
 libatk_1_0_la_DEPENDENCIES = atk-win32-res.o atk.def
 
 install-def-file:
-       $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def
+       $(INSTALL) atk.def $(DESTDIR)$(libdir)/atk-1.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/atk-1.0.def
 else
@@ -214,9 +219,9 @@ atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
        lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
 
 
-EXTRA_DIST = atk.symbols atk.rc.in atkmarshal.list atkintl.h atk.rc
+EXTRA_DIST = atk.symbols atk.rc.in atkmarshal.list atkintl.h atk.rc atkversion.h.in
 
-dist-hook: ../build/win32/vs9/atk.vcproj
+dist-hook: ../build/win32/vs9/atk.vcproj ../build/win32/vs10/atk.vcxproj ../build/win32/vs10/atk.vcxproj.filters
 
 ../build/win32/vs9/atk.vcproj: ../build/win32/vs9/atk.vcprojin
        for F in $(libatk_1_0_la_SOURCES); do \
@@ -227,6 +232,26 @@ dist-hook: ../build/win32/vs9/atk.vcproj
        done >libatk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/atk.vcprojin >$@
        rm libatk.sourcefiles
+       
+../build/win32/vs10/atk.vcxproj: ../build/win32/vs10/atk.vcxprojin
+       for F in $(libatk_1_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\atk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libatk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk.vcxprojin >$@
+       rm libatk.vs10.sourcefiles
+       
+../build/win32/vs10/atk.vcxproj.filters: ../build/win32/vs10/atk.vcxproj.filtersin
+       for F in $(libatk_1_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\atk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libatk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk.vcxproj.filtersin >$@
+       rm libatk.vs10.sourcefiles.filters
 
 DISTCLEANFILES = \
   stamp-atkmarshal.h stamp-atkmarshal.c \