X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk%2FMakefile.am;h=1209dbb64f7a46dcbba778d4c859826cd69f38d1;hb=e91d02fcd860bd758e8ec9b85b19a16cdffba2bc;hp=e33cc89a0cd404de12668be1b3fcf6c0558b0be8;hpb=2966f498c6c5d7c9ebc7c61d0f2a96c4ca95979b;p=platform%2Fupstream%2Fatk.git diff --git a/atk/Makefile.am b/atk/Makefile.am index e33cc89..1209dbb 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -4,6 +4,7 @@ GPATH = $(srcdir) include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ENV = CC="$(CC)" CLEANFILES = @@ -13,13 +14,14 @@ else no_undefined = endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_DISABLE_DEPRECATED \ -DATK_DISABLE_DEPRECATED \ -DATK_COMPILATION \ -DATK_LOCALEDIR="\"$(datadir)/locale\"" \ - $(DEP_CFLAGS) + $(DEP_CFLAGS) \ + $(ATK_HIDDEN_VISIBILITY_CFLAGS) lib_LTLIBRARIES = libatk-1.0.la @@ -45,6 +47,9 @@ atk_sources = \ atkobject.c \ atkobjectfactory.c \ atkplug.c \ + atkprivate.h \ + atkprivate.c \ + atkrange.c \ atkregistry.c \ atkrelation.c \ atkrelationset.c \ @@ -54,10 +59,13 @@ atk_sources = \ 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) \ @@ -66,7 +74,6 @@ libatk_1_0_la_SOURCES = \ libatkincludedir=$(includedir)/atk-1.0/atk atk_headers = \ - atk.h \ atkaction.h \ atkcomponent.h \ atkdocument.h \ @@ -81,6 +88,7 @@ atk_headers = \ atkobjectfactory.h \ atkplug.h \ atkimage.h \ + atkrange.h \ atkregistry.h \ atkrelation.h \ atkrelationtype.h \ @@ -91,13 +99,17 @@ atk_headers = \ 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 @@ -125,9 +137,9 @@ atk-enum-types.h: s-enum-types-h @true s-enum-types-h: @REBUILD@ $(atk_headers) Makefile $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)\n#error \"Only can be included directly.\"\n#endif\n\n#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fhead "#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)\n#error \"Only can be included directly.\"\n#endif\n\n#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include \n#include \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 ) \ @@ -138,7 +150,7 @@ atk-enum-types.c: s-enum-types-c @true s-enum-types-c: @REBUILD@ $(atk_headers) Makefile $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#include " \ + --fhead "#include \"config.h\"\n\n#include " \ --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@\" }," \ @@ -148,105 +160,17 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile && rm -f tmp-atk-enum-types.c \ && echo timestamp > $(@F) - -if HAVE_INTROSPECTION -introspection_sources = \ - $(atk_headers) \ - $(atk_sources) -introspection_generated_sources = \ - atk-enum-types.c \ - atk-enum-types.h - -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 --warn-all -Atk_1_0_gir_FILES = \ - $(addprefix $(srcdir)/, $(introspection_sources)) \ - $(introspection_generated_sources) -INTROSPECTION_GIRS += Atk-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) -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_DEPENDENCIES = atk-win32-res.o atk.def - -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: +libatk_1_0_la_LDFLAGS += -no-undefined -Wl,atk-win32-res.o +libatk_1_0_la_DEPENDENCIES = atk-win32-res.o 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.def: atk.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > atk.def - -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 - -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 \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - 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 ' ' \ - ;; \ - 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 ' Source Files' \ - ;; \ - esac; \ - done >libatk.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/atk.vcxproj.filtersin >$@ - rm libatk.vs10.sourcefiles.filters +EXTRA_DIST = atk.rc.in atkmarshal.list atk.rc atkversion.h.in DISTCLEANFILES = \ stamp-atkmarshal.h stamp-atkmarshal.c \ @@ -256,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