Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...
[platform/upstream/atk.git] / atk / Makefile.am
index 43dbed5..1209dbb 100644 (file)
@@ -2,25 +2,37 @@
 # which are more like other make's VPATH.
 GPATH = $(srcdir)
 
+include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+
+CLEANFILES =
+
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 else
 no_undefined =
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -DG_DISABLE_DEPRECATED  \
-       $(DEP_CFLAGS)
+       -DATK_DISABLE_DEPRECATED        \
+       -DATK_COMPILATION       \
+       -DATK_LOCALEDIR="\"$(datadir)/locale\"" \
+       $(DEP_CFLAGS)   \
+       $(ATK_HIDDEN_VISIBILITY_CFLAGS)
 
 lib_LTLIBRARIES = libatk-1.0.la
 
 libatk_1_0_la_LDFLAGS =                        \
        -version-info $(LT_VERSION_INFO)        \
        $(no_undefined)
-libatk_1_0_la_LIBADD = $(DEP_LIBS)
+libatk_1_0_la_LIBADD = \
+       $(DEP_LIBS)     \
+       $(INTLLIBS)
 
-libatk_1_0_la_SOURCES =        \
+atk_sources =  \
        atkaction.c             \
        atkcomponent.c          \
        atkdocument.c           \
@@ -34,24 +46,34 @@ libatk_1_0_la_SOURCES =     \
        atknoopobjectfactory.c  \
        atkobject.c             \
        atkobjectfactory.c      \
+       atkplug.c               \
+       atkprivate.h            \
+       atkprivate.c            \
+       atkrange.c              \
        atkregistry.c           \
        atkrelation.c           \
        atkrelationset.c        \
        atkselection.c          \
+       atksocket.c             \
        atkstate.c              \
        atkstateset.c           \
        atkstreamablecontent.c  \
        atktable.c              \
+       atktablecell.c          \
        atktext.c               \
        atkutil.c               \
        atkmisc.c               \
-       atkvalue.c              \
+       atkvalue.c              \
+       atkversion.c            \
+       atkwindow.c
+
+libatk_1_0_la_SOURCES =        \
+       $(atk_sources)          \
        atk-enum-types.c
 
 libatkincludedir=$(includedir)/atk-1.0/atk
 
 atk_headers = \
-        atk.h                  \
         atkaction.h            \
         atkcomponent.h         \
         atkdocument.h          \
@@ -64,23 +86,30 @@ atk_headers = \
         atknoopobjectfactory.h \
         atkobject.h            \
        atkobjectfactory.h      \
+        atkplug.h              \
         atkimage.h             \
+       atkrange.h              \
         atkregistry.h          \
         atkrelation.h          \
         atkrelationtype.h      \
         atkrelationset.h       \
         atkselection.h         \
+        atksocket.h            \
         atkstate.h             \
         atkstateset.h          \
         atkstreamablecontent.h \
         atktable.h             \
+        atktablecell.h         \
         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
 
 
@@ -91,7 +120,7 @@ BUILT_SOURCES = atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c
 atkmarshal.h: stamp-atkmarshal.h
        @true
 stamp-atkmarshal.h: @REBUILD@ atkmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \
        && (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~                                     \
        && echo timestamp > $(@F)
@@ -99,7 +128,7 @@ stamp-atkmarshal.h: @REBUILD@ atkmarshal.list
 atkmarshal.c: stamp-atkmarshal.c
        @true
 stamp-atkmarshal.c: @REBUILD@ atkmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \
        && (cmp -s xgen-gmc atkmarshal.c || cp xgen-gmc atkmarshal.c) \
        && rm -f xgen-gmc xgen-gmc~                                     \
        && echo timestamp > $(@F)
@@ -107,10 +136,10 @@ stamp-atkmarshal.c: @REBUILD@ atkmarshal.list
 atk-enum-types.h: s-enum-types-h
        @true
 s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
-       ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+                       --fhead "#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)\n#error \"Only <atk/atk.h> can be included directly.\"\n#endif\n\n#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <atk/atkversion.h>\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
                        --fprod "/* enumerations from \"@filename@\" */\n" \
-                       --vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+                       --vhead "ATK_AVAILABLE_IN_ALL\nGType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
                        --ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \
                $(atk_headers) ) > tmp-atk-enum-types.h \
        && (cmp -s tmp-atk-enum-types.h atk-enum-types.h || cp tmp-atk-enum-types.h atk-enum-types.h ) \
@@ -120,8 +149,8 @@ s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
 atk-enum-types.c: s-enum-types-c
        @true
 s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
-       ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#include <atk.h>" \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+                       --fhead "#include \"config.h\"\n\n#include <atk.h>" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
@@ -134,39 +163,14 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
 # ---------- 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 += -no-undefined -Wl,atk-win32-res.o
 libatk_1_0_la_DEPENDENCIES = atk-win32-res.o
-
-install-def-file:
-       $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def
-uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/atk-1.0.def
-else
-install-def-file:
-uninstall-def-file:
 endif
 
 atk-win32-res.o: atk.rc
        $(WINDRES) $< $@
 
-if MS_LIB_AVAILABLE
-noinst_DATA = atk-$(ATK_API_VERSION).lib
-
-install-ms-lib:
-       $(INSTALL) atk-$(ATK_API_VERSION).lib $(DESTDIR)$(libdir)
-
-uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/atk-$(ATK_API_VERSION).lib
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-
-atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
-       lib -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
-
-
-EXTRA_DIST = atk.def atk.rc.in atkmarshal.list atkintl.h
+EXTRA_DIST = atk.rc.in atkmarshal.list atk.rc atkversion.h.in
 
 DISTCLEANFILES = \
   stamp-atkmarshal.h stamp-atkmarshal.c \
@@ -176,7 +180,3 @@ distclean-local:
        if test $(srcdir) = .; then :; else \
          rm -f atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c; \
        fi
-
-install-data-local: install-ms-lib install-def-file
-
-uninstall-local: uninstall-ms-lib uninstall-def-file