GNOME.org
 

[gtkmm/gtkmm-2-22] Split off atkmm into its own separate module

commit a5d84bbc0cb6747ec812793a5077d31050709c45
Author: Daniel Elstner <danielk openismus com>
Date:   Wed Jun 23 01:34:57 2010 +0200

    Split off atkmm into its own separate module
    
    * atk/, MSVC_Net200[58]/atkmm/: Delete atkmm subdirectories.
    * configure.ac: Remove module definition of atkmm-1.6.  Adjust the
    pkg-config dependencies to pull in an installed atkmm.
    * **/Makefile.am: Remove references to atkmm from the build rules.
    * docs/reference/Doxyfile.in: Remove references to in-tree atkmm.
    * gtk/{gtkmm,gtkmm-uninstalled}.pc.in: Remove atkmm substitutions.
    * tools/extra_defs_gen/generate_defs_gtk.cc: Remove code to output
    definitions for ATK types.

 AUTHORS                                   |    4 +-
 ChangeLog                                 |   13 +
 MSVC_Net2005/atkmm/atkmm.rc.in            |   71 -
 MSVC_Net2005/atkmm/atkmm.vcproj           |  378 ---
 MSVC_Net2005/filelist.am                  |    2 -
 MSVC_Net2008/atkmm/atkmm.rc.in            |   71 -
 MSVC_Net2008/atkmm/atkmm.vcproj           |  377 ---
 MSVC_Net2008/filelist.am                  |    2 -
 Makefile.am                               |   19 +-
 atk/atkmm-uninstalled.pc.in               |   10 -
 atk/atkmm.h                               |   42 -
 atk/atkmm.pc.in                           |   19 -
 atk/atkmm/Makefile.am                     |   39 -
 atk/atkmm/filelist.am                     |    9 -
 atk/atkmm/init.cc                         |   34 -
 atk/atkmm/init.h                          |   40 -
 atk/atkmm/private/.gitignore              |    1 -
 atk/atkmm/wrap_init.h                     |   32 -
 atk/src/Makefile.am                       |   29 -
 atk/src/action.ccg                        |   22 -
 atk/src/action.hg                         |   73 -
 atk/src/atk.defs                          |    4 -
 atk/src/atk_docs.xml                      | 4454 -----------------------------
 atk/src/atk_docs_override.xml             |  117 -
 atk/src/atk_enums.defs                    |  263 --
 atk/src/atk_methods.defs                  | 2284 ---------------
 atk/src/atk_signals.defs                  |  390 ---
 atk/src/atk_vfuncs.defs                   |  855 ------
 atk/src/component.ccg                     |   23 -
 atk/src/component.hg                      |   91 -
 atk/src/document.ccg                      |   30 -
 atk/src/document.hg                       |   55 -
 atk/src/editabletext.ccg                  |   23 -
 atk/src/editabletext.hg                   |   70 -
 atk/src/filelist.am                       |   33 -
 atk/src/hyperlink.ccg                     |   30 -
 atk/src/hyperlink.hg                      |   72 -
 atk/src/hypertext.ccg                     |   30 -
 atk/src/hypertext.hg                      |   61 -
 atk/src/image.ccg                         |   23 -
 atk/src/image.hg                          |   67 -
 atk/src/implementor.ccg                   |   23 -
 atk/src/implementor.hg                    |   45 -
 atk/src/noopobject.ccg                    |   22 -
 atk/src/noopobject.hg                     |   71 -
 atk/src/object.ccg                        |   61 -
 atk/src/object.hg                         |  108 -
 atk/src/objectaccessible.ccg              |   23 -
 atk/src/objectaccessible.hg               |   46 -
 atk/src/relation.ccg                      |   54 -
 atk/src/relation.hg                       |   59 -
 atk/src/relationset.ccg                   |   23 -
 atk/src/relationset.hg                    |   52 -
 atk/src/selection.ccg                     |   23 -
 atk/src/selection.hg                      |   71 -
 atk/src/stateset.ccg                      |   40 -
 atk/src/stateset.hg                       |   60 -
 atk/src/streamablecontent.ccg             |   30 -
 atk/src/streamablecontent.hg              |   58 -
 atk/src/table.ccg                         |   45 -
 atk/src/table.hg                          |  142 -
 atk/src/text.ccg                          |  111 -
 atk/src/text.hg                           |  194 --
 atk/src/value.ccg                         |   22 -
 atk/src/value.hg                          |   58 -
 configure.ac                              |   34 +-
 demos/Makefile.am                         |   13 +-
 docs/Makefile.am                          |    6 +-
 docs/reference/Doxyfile.in                |   18 +-
 gtk/gtkmm-uninstalled.pc.in               |    2 +-
 gtk/gtkmm.pc.in                           |    2 +-
 gtk/gtkmm/Makefile.am                     |   11 +-
 tests/Makefile.am                         |   11 +-
 tools/extra_defs_gen/generate_defs_gtk.cc |   21 -
 74 files changed, 43 insertions(+), 11778 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 35ef03f..fd61e1c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,8 @@
 Please use the mailing list (gtkmm-list gnome org) instead of emailing developers directly.
 See the ChangeLog for up-to-date information.
 
-Murray Cumming <murrayc usa net>
-Daniel Elstner <daniel elstner gmx net>
+Murray Cumming
+Daniel Elstner
 
 Some former contributors:
 
diff --git a/ChangeLog b/ChangeLog
index 484cf34..f98e9bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-23  Daniel Elstner  <danielk openismus com>
+
+	Split off atkmm into its own separate module
+
+	* atk/, MSVC_Net200[58]/atkmm/: Delete atkmm subdirectories.
+	* configure.ac: Remove module definition of atkmm-1.6.  Adjust the
+	pkg-config dependencies to pull in an installed atkmm.
+	* **/Makefile.am: Remove references to atkmm from the build rules.
+	* docs/reference/Doxyfile.in: Remove references to in-tree atkmm.
+	* gtk/{gtkmm,gtkmm-uninstalled}.pc.in: Remove atkmm substitutions.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Remove code to output
+	definitions for ATK types.
+
 2010-06-16  Murray Cumming  <murrayc murrayc com>
 
 	Entry: Added im_context_filter_keypress().
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
index bde4e64..1e9f4d4 100644
--- a/MSVC_Net2005/filelist.am
+++ b/MSVC_Net2005/filelist.am
@@ -6,8 +6,6 @@ msvc_net2005_data =				\
 	gtkmm.sln				\
 	gendef/gendef.vcproj			\
 	gendef/gendef.cc			\
-	atkmm/atkmm.rc				\
-	atkmm/atkmm.vcproj			\
 	gdkmm/gdkmm.rc				\
 	gdkmm/gdkmm.vcproj			\
 	gdkmm/gdkmmconfig.h			\
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
index 7d930e0..f7f4ec3 100644
--- a/MSVC_Net2008/filelist.am
+++ b/MSVC_Net2008/filelist.am
@@ -6,8 +6,6 @@ msvc_net2008_data =				\
 	gtkmm.sln				\
 	gendef/gendef.vcproj			\
 	gendef/gendef.cc			\
-	atkmm/atkmm.rc				\
-	atkmm/atkmm.vcproj			\
 	gdkmm/gdkmm.rc				\
 	gdkmm/gdkmm.vcproj			\
 	gdkmm/gdkmmconfig.h			\
diff --git a/Makefile.am b/Makefile.am
index eb7b1e0..161c856 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,17 +18,8 @@
 ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
-if GTKMM_ATKMM_ENABLED
-atk_maint_subdir = atk/src
-atk_built_subdir = atk/atkmm
-atk_atkmm_pcfile = atk/$(ATKMM_MODULE_NAME).pc
-else
-atk_maint_subdir =
-atk_built_subdir =
-atk_atkmm_pcfile =
-endif
 if MAINTAINER_MODE
-src_subdirs = tools $(atk_maint_subdir) gdk/src gtk/src
+src_subdirs = gdk/src gtk/src
 else
 src_subdirs =
 endif
@@ -37,12 +28,8 @@ doc_subdirs = docs
 else
 doc_subdirs =
 endif
-SUBDIRS = $(src_subdirs) $(atk_built_subdir) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs)
+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs)
 
-if GTKMM_ATKMM_ENABLED
-atkmm_includedir = $(includedir)/$(ATKMM_MODULE_NAME)
-atkmm_include_HEADERS = atk/atkmm.h
-endif
 gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME)
 gdkmm_include_HEADERS = gdk/gdkmm.h
 gdkmm_libincludedir = $(libdir)/$(GDKMM_MODULE_NAME)/include
@@ -54,7 +41,7 @@ gtkmm_libincludedir = $(libdir)/$(GTKMM_MODULE_NAME)/include
 nodist_gtkmm_libinclude_HEADERS = gtk/gtkmmconfig.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-nodist_pkgconfig_DATA = $(atk_atkmm_pcfile) gdk/$(GDKMM_MODULE_NAME).pc gtk/$(GTKMM_MODULE_NAME).pc
+pkgconfig_DATA = gdk/$(GDKMM_MODULE_NAME).pc gtk/$(GTKMM_MODULE_NAME).pc
 
 include $(srcdir)/MSVC_Net2005/filelist.am
 include $(srcdir)/MSVC_Net2008/filelist.am
diff --git a/configure.ac b/configure.ac
index c217632..b1fc2a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
+
 MM_PREREQ([0.8])
-MM_INIT_MODULE([atkmm-1.6])
 MM_INIT_MODULE([gdkmm-2.4])
 MM_INIT_MODULE([gtkmm-2.4])
 
@@ -53,17 +53,21 @@ AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$gtkmm_host_windows" = xyes])
 AS_IF([test "x$enable_static" = xyes],
       [AC_DEFINE([GTKMM_STATIC_LIB], [1], [Define when building gtkmm as a static library])])
 
-AC_SUBST([ATKMM_MODULES], ['glibmm-2.4 >= 2.24 atk >= 1.12'])
-
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
 AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.20.0'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
       [GTKMM_MODULES="$GDKMM_MODULES gtk+-unix-print-2.0"])
+
+# Offer the ability to omit some API from the library, to reduce the code size.
+# Note that there are other options in glibmm, which affect gtkmm.
+GTKMM_ARG_ENABLE_API_ATKMM
+
+AS_IF([test "x$gtkmm_enable_api_atkmm" != xno],
+      [GTKMM_MODULES="atkmm-1.6 >= 2.21.1 $GTKMM_MODULES"])
 AC_SUBST([GTKMM_MODULES])
 
-PKG_CHECK_MODULES([ATKMM], [$ATKMM_MODULES])
 PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES])
 PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES])
 
@@ -71,19 +75,8 @@ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
-# Offer the ability to omit some API from the library, to reduce the code size.
-# Note that there are other options in glibmm, which affect gtkmm.
-GTKMM_ARG_ENABLE_API_ATKMM
-
-AS_IF([test "x$gtkmm_enable_api_atkmm" = xno],
-      [GTKMM_REQ_ATKMM= GTKMM_REQ_ATKMM_UNINST=],
-      [GTKMM_REQ_ATKMM=$ATKMM_MODULE_NAME GTKMM_REQ_ATKMM_UNINST=$ATKMM_MODULE_NAME-uninstalled])
-AC_SUBST([GTKMM_REQ_ATKMM])
-AC_SUBST([GTKMM_REQ_ATKMM_UNINST])
-AM_CONDITIONAL([GTKMM_ATKMM_ENABLED], [test "x$gtkmm_enable_api_atkmm" != xno])
-
 GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
-MM_ARG_DISABLE_DEPRECATED_API([ATKMM GDKMM GTKMM])
+MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
@@ -91,6 +84,7 @@ MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
 MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
 MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
+MM_ARG_WITH_TAGFILE_DOC([atkmm-1.6.tag], [atkmm-1.6])
 
 AC_LANG([C++])
 AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
@@ -99,14 +93,10 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
 MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
                        [-Wall],
                        [-pedantic -Wall -Wextra -DGSEAL_ENABLE],
-                       [G PANGO ATK GDK GDK_PIXBUF GTK PANGOMM])
+                       [G PANGO ATK GDK GDK_PIXBUF GTK ATKMM PANGOMM])
 
 AC_CONFIG_FILES([Makefile
                  tools/Makefile
-                 atk/${ATKMM_MODULE_NAME}.pc:atk/atkmm.pc.in
-                 atk/${ATKMM_MODULE_NAME}-uninstalled.pc:atk/atkmm-uninstalled.pc.in
-                 atk/src/Makefile
-                 atk/atkmm/Makefile
                  gdk/${GDKMM_MODULE_NAME}.pc:gdk/gdkmm.pc.in
                  gdk/${GDKMM_MODULE_NAME}-uninstalled.pc:gdk/gdkmm-uninstalled.pc.in
                  gdk/src/Makefile
@@ -119,10 +109,8 @@ AC_CONFIG_FILES([Makefile
                  demos/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2005/atkmm/atkmm.rc
                  MSVC_Net2005/gdkmm/gdkmm.rc
                  MSVC_Net2005/gtkmm/gtkmm.rc
-                 MSVC_Net2008/atkmm/atkmm.rc
                  MSVC_Net2008/gdkmm/gdkmm.rc
                  MSVC_Net2008/gtkmm/gtkmm.rc
                  win32_installer/gtkmm-installer.nsi])
diff --git a/demos/Makefile.am b/demos/Makefile.am
index b71a8b4..1618bce 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -65,25 +65,18 @@ dist_noinst_DATA =			\
 	gtk-demo/gnu-keys.png		\
 	gtk-demo/gtk-logo-rgb.gif
 
-if GTKMM_ATKMM_ENABLED
-atkmm_includes = -I$(top_builddir)/atk $(if $(srcdir:.=),-I$(top_srcdir)/atk)
-atkmm_ldadd    = $(top_builddir)/atk/atkmm/libatkmm-$(ATKMM_API_VERSION).la
-else
-atkmm_includes =
-atkmm_ldadd    =
-endif
 gdkmm_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk)
 gdkmm_ldadd    = $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
 
 gtkmm_includes = -I$(top_builddir)/gtk $(if $(srcdir:.=),-I$(top_srcdir)/gtk)
 gtkmm_ldadd    = $(top_builddir)/gtk/gtkmm/libgtkmm-$(GTKMM_API_VERSION).la
 
-local_includes = -I$(top_builddir) $(atkmm_includes) $(gdkmm_includes) $(gtkmm_includes)
-local_ldadd    = $(atkmm_ldadd) $(gdkmm_ldadd) $(gtkmm_ldadd)
+local_includes = -I$(top_builddir) $(gdkmm_includes) $(gtkmm_includes)
+local_ldadd    = $(gdkmm_ldadd) $(gtkmm_ldadd)
 local_cppflags = -DDEMOCODEDIR=\""$(democodedir)"\"
 
 AM_CPPFLAGS = $(local_includes) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS) $(local_cppflags)
-AM_CXXFLAGS = $(GTKMM_WXXFLAGS) -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DATKMM_DISABLE_DEPRECATED
+AM_CXXFLAGS = $(GTKMM_WXXFLAGS) -DGTKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED
 
 pixbuf_demo_LDADD         = $(GTKMM_LIBS) $(local_ldadd)
 gtk_demo_gtkmm_demo_LDADD = $(GTKMM_LIBS) $(local_ldadd)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 700aa17..93ca5df 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -15,20 +15,16 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-include $(top_srcdir)/atk/src/filelist.am
-include $(top_srcdir)/atk/atkmm/filelist.am
 include $(top_srcdir)/gdk/src/filelist.am
 include $(top_srcdir)/gdk/gdkmm/filelist.am
 include $(top_srcdir)/gtk/src/filelist.am
 include $(top_srcdir)/gtk/gtkmm/filelist.am
 
-atkmm_files_h = $(atkmm_files_built_h) $(filter-out wrap_init.h,$(atkmm_files_extra_h))
 gdkmm_files_h = $(gdkmm_files_built_h) $(filter-out wrap_init.h,$(gdkmm_files_extra_h))
 gtkmm_files_h = $(gtkmm_files_built_h) $(filter-out wrap_init.h,$(gtkmm_files_extra_h))
 
 book_name = $(GTKMM_MODULE_NAME)
-doc_input = $(addprefix $(top_srcdir)/atk/atkmm/,$(atkmm_files_h)) \
-            $(addprefix $(top_srcdir)/gdk/gdkmm/,$(gdkmm_files_h)) \
+doc_input = $(addprefix $(top_srcdir)/gdk/gdkmm/,$(gdkmm_files_h)) \
             $(addprefix $(top_srcdir)/gtk/gtkmm/,$(gtkmm_files_h)) \
 	    $(top_srcdir)/gtk/gtkmm.h
 
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index dbd19b1..a22f636 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -16,17 +16,13 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = "@abs_top_builddir@/atk/" \
-                         "@abs_top_srcdir@/atk/" \
-                         "@abs_top_builddir@/gdk/" \
+STRIP_FROM_PATH        = "@abs_top_builddir@/gdk/" \
                          "@abs_top_srcdir@/gdk/" \
                          "@abs_top_builddir@/gtk/" \
                          "@abs_top_srcdir@/gtk/" \
                          "@abs_top_builddir@/" \
                          "@abs_top_srcdir@/"
-STRIP_FROM_INC_PATH    = "@abs_top_builddir@/atk/" \
-                         "@abs_top_srcdir@/atk/" \
-                         "@abs_top_builddir@/gdk/" \
+STRIP_FROM_INC_PATH    = "@abs_top_builddir@/gdk/" \
                          "@abs_top_srcdir@/gdk/" \
                          "@abs_top_builddir@/gtk/" \
                          "@abs_top_srcdir@/gtk/" \
@@ -241,9 +237,7 @@ ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = "@abs_top_builddir@/atk" \
-                         "@abs_top_srcdir@/atk" \
-                         "@abs_top_builddir@/gdk" \
+INCLUDE_PATH           = "@abs_top_builddir@/gdk" \
                          "@abs_top_srcdir@/gdk" \
                          "@abs_top_builddir@/gtk" \
                          "@abs_top_srcdir@/gtk"
@@ -259,15 +253,11 @@ PREDEFINED             = __cplusplus \
                          GLIBMM_HAVE_WIDE_STREAM \
                          GLIBMM_PROPERTIES_ENABLED \
                          GLIBMM_VFUNCS_ENABLED \
-                         "ATKMM_API=" \
                          "GDKMM_API=" \
                          "GTKMM_API=" \
                          GTKMM_ATKMM_ENABLED \
                          "GTKMM_USING_STD(x)="
-EXPAND_AS_DEFINED      = ATKMM_MAJOR_VERSION \
-                         ATKMM_MINOR_VERSION \
-                         ATKMM_MICRO_VERSION \
-                         GDKMM_MAJOR_VERSION \
+EXPAND_AS_DEFINED      = GDKMM_MAJOR_VERSION \
                          GDKMM_MINOR_VERSION \
                          GDKMM_MICRO_VERSION \
                          GTKMM_MAJOR_VERSION \
diff --git a/gtk/gtkmm-uninstalled.pc.in b/gtk/gtkmm-uninstalled.pc.in
index 924c2fe..2a569d6 100644
--- a/gtk/gtkmm-uninstalled.pc.in
+++ b/gtk/gtkmm-uninstalled.pc.in
@@ -5,6 +5,6 @@ Name: gtkmm
 Description: C++ binding for the GTK+ toolkit, not installed
 Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
-Requires: @GTKMM_MODULES@ @GTKMM_REQ_ATKMM_UNINST@ @GDKMM_MODULE_NAME -uninstalled
+Requires: @GTKMM_MODULES@ @GDKMM_MODULE_NAME -uninstalled
 Libs: ${pc_top_builddir}/${pcfiledir}/gtkmm/libgtkmm- GTKMM_API_VERSION@.la
 Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/gtk/gtkmm.pc.in b/gtk/gtkmm.pc.in
index bbf4108..93607bf 100644
--- a/gtk/gtkmm.pc.in
+++ b/gtk/gtkmm.pc.in
@@ -14,6 +14,6 @@ Name: gtkmm
 Description: C++ binding for the GTK+ toolkit
 Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
-Requires: @GTKMM_MODULES@ @GTKMM_REQ_ATKMM@ @GDKMM_MODULE_NAME@
+Requires: @GTKMM_MODULES@ @GDKMM_MODULE_NAME@
 Libs: -L${libdir} -lgtkmm- GTKMM_API_VERSION@
 Cflags: -I${includedir}/@GTKMM_MODULE_NAME@ -I${libdir}/@GTKMM_MODULE_NAME@/include
diff --git a/gtk/gtkmm/Makefile.am b/gtk/gtkmm/Makefile.am
index f763bc2..1e48884 100644
--- a/gtk/gtkmm/Makefile.am
+++ b/gtk/gtkmm/Makefile.am
@@ -27,15 +27,8 @@ files_extra_cc = $(gtkmm_files_extra_cc)
 files_extra_h  = $(gtkmm_files_extra_h)
 files_extra_ph = $(gtkmm_files_extra_ph)
 
-if GTKMM_ATKMM_ENABLED
-atkmm_includes = -I$(top_builddir)/atk $(if $(srcdir:.=),-I$(top_srcdir)/atk)
-atkmm_libadd   = $(top_builddir)/atk/atkmm/libatkmm-$(ATKMM_API_VERSION).la
-else
-atkmm_includes =
-atkmm_libadd   =
-endif
-local_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk) $(atkmm_includes)
-local_libadd   = $(atkmm_libadd) $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
+local_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk)
+local_libadd   = $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
 
 include $(top_srcdir)/build/compile-binding.am
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e7136a2..b8713fa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,21 +48,14 @@ refcount_dialog_test_SOURCES       = refcount_dialog/main.cc
 scrolledwindow_test_SOURCES        = scrolledwindow/main.cc
 wrap_existing_test_SOURCES         = wrap_existing/main.cc
 
-if GTKMM_ATKMM_ENABLED
-atkmm_includes = -I$(top_builddir)/atk $(if $(srcdir:.=),-I$(top_srcdir)/atk)
-atkmm_ldadd    = $(top_builddir)/atk/atkmm/libatkmm-$(ATKMM_API_VERSION).la
-else
-atkmm_includes =
-atkmm_ldadd    =
-endif
 gdkmm_includes = -I$(top_builddir)/gdk $(if $(srcdir:.=),-I$(top_srcdir)/gdk)
 gdkmm_ldadd    = $(top_builddir)/gdk/gdkmm/libgdkmm-$(GDKMM_API_VERSION).la
 
 gtkmm_includes = -I$(top_builddir)/gtk $(if $(srcdir:.=),-I$(top_srcdir)/gtk)
 gtkmm_ldadd    = $(top_builddir)/gtk/gtkmm/libgtkmm-$(GTKMM_API_VERSION).la
 
-local_includes = -I$(top_builddir) $(atkmm_includes) $(gdkmm_includes) $(gtkmm_includes)
-local_ldadd    = $(atkmm_ldadd) $(gdkmm_ldadd) $(gtkmm_ldadd)
+local_includes = -I$(top_builddir) $(gdkmm_includes) $(gtkmm_includes)
+local_ldadd    = $(gdkmm_ldadd) $(gtkmm_ldadd)
 
 AM_CPPFLAGS = $(local_includes) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 46c7729..314db30 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -22,7 +22,6 @@
 // We always need to generate the .defs for all types because the code
 // using deprecated API is generated unconditionally and only disabled
 // at compile time.
-#undef ATK_DISABLE_DEPRECATED
 #undef GDK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_DEPRECATED
 
@@ -37,26 +36,6 @@ int main(int argc, char** argv)
 {
   gtk_init(&argc, &argv);
 
-  void *const g_class_atk_no_op_object = g_type_class_ref(ATK_TYPE_NO_OP_OBJECT);
-
-  std::cout << get_defs( ATK_TYPE_OBJECT )
-            << get_defs( ATK_TYPE_COMPONENT )
-            << get_defs( ATK_TYPE_ACTION )
-            << get_defs( ATK_TYPE_EDITABLE_TEXT )
-            << get_defs( ATK_TYPE_HYPERLINK )
-            << get_defs( ATK_TYPE_HYPERTEXT )
-            << get_defs( ATK_TYPE_IMAGE )
-            << get_defs( ATK_TYPE_SELECTION )
-            << get_defs( ATK_TYPE_TABLE )
-            << get_defs( ATK_TYPE_TEXT )
-            << get_defs( ATK_TYPE_VALUE )
-            << get_defs( ATK_TYPE_REGISTRY )
-            << get_defs( ATK_TYPE_RELATION )
-            << get_defs( ATK_TYPE_RELATION_SET )
-            << get_defs( ATK_TYPE_STATE_SET );
-
-  g_type_class_unref(g_class_atk_no_op_object);
-
   std::cout << get_defs( GDK_TYPE_COLORMAP )
             << get_defs( GDK_TYPE_DRAG_CONTEXT )
             << get_defs( GDK_TYPE_DISPLAY )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]