[gtkmm] Skip over intermediate subdir in recursion

[Daniel Elstner <daniel src gnome org>]

commit 9b2fd7ffc1af6d2641fd4b2537ec93690bf5fa2c
Author: Daniel Elstner <danielk openismus com>
Date:   Wed Aug 12 14:33:22 2009 +0200

    Skip over intermediate subdir in recursion
    
    * configure.ac (AC_CONFIG_FILES): Remove {atk,gdk,gtk}/Makefile.
    (AC_CONFIG_HEADERS): Bring back gdkmmconfig.h.
    * Makefile.am (SUBDIRS): Skip over {atk,gdk,gtk}/ and recurse
    directly into {atk,gdk,gtk}/src and {atk,gdk,gtk}/{atk,gdk,gtk}mm.
    Reorganize the conditional inclusion of atkmm in the build.
    ({atk,gdk,gtk}mm_include_HEADERS): Install *mm.h central headers.
    (nodist_g[dt]kmm_libinclude_HEADERS): Install *mmconfig.h headers.
    (nodist_pkgconfig_DATA): Install pkg-config metadata files.
    * {atk,gdk,gtk}/Makefile.am: Delete now unused files.
    * {atk,gdk,gtk}/README: Delete either empty or unhelpful files.

 ChangeLog       |   15 ++++++++
 Makefile.am     |  108 ++++++++++++++++---------------------------------------
 atk/Makefile.am |   14 -------
 configure.ac    |    5 +--
 gdk/Makefile.am |   13 -------
 gdk/README      |    1 -
 gtk/Makefile.am |   13 -------
 gtk/README      |    6 ---
 8 files changed, 47 insertions(+), 128 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6788514..d04a445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2009-08-12  Daniel Elstner  <danielk openismus com>
 
+	Skip over intermediate subdir in recursion
+
+	* configure.ac (AC_CONFIG_FILES): Remove {atk,gdk,gtk}/Makefile.
+	(AC_CONFIG_HEADERS): Bring back gdkmmconfig.h.
+	* Makefile.am (SUBDIRS): Skip over {atk,gdk,gtk}/ and recurse
+	directly into {atk,gdk,gtk}/src and {atk,gdk,gtk}/{atk,gdk,gtk}mm.
+	Reorganize the conditional inclusion of atkmm in the build.
+	({atk,gdk,gtk}mm_include_HEADERS): Install *mm.h central headers.
+	(nodist_g[dt]kmm_libinclude_HEADERS): Install *mmconfig.h headers.
+	(nodist_pkgconfig_DATA): Install pkg-config metadata files.
+	* {atk,gdk,gtk}/Makefile.am: Delete now unused files.
+	* {atk,gdk,gtk}/README: Delete either empty or unhelpful files.
+
+2009-08-12  Daniel Elstner  <danielk openismus com>
+
 	Begin transition to mm-common build system
 
 	* autogen.sh: Replace with minimal script already used in pangomm,
diff --git a/Makefile.am b/Makefile.am
index 51a71e3..5967c99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,89 +16,43 @@
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I scripts ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
 if GTKMM_ATKMM_ENABLED
-  ATK_SUBDIR=atk
+atk_maint_subdir = atk/src
+atk_built_subdir = atk/atkmm
+atk_atkmm_pcfile = atk/$(ATKMM_MODULE_NAME).pc
 else
-  ATK_SUBDIR=
+atk_maint_subdir =
+atk_built_subdir =
+atk_atkmm_pcfile =
 endif
+if MAINTAINER_MODE
+src_subdirs = tools $(atk_maint_subdir) gdk/src gtk/src
+else
+src_subdirs =
+endif
+SUBDIRS = $(src_subdirs) $(atk_built_subdir) gdk/gdkmm gtk/gtkmm \
+	  tests MSVC_Net2005 MSVC_Net2008 win32_installer
+DIST_SUBDIRS = $(SUBDIRS) demos docs scripts
 
-SUBDIRS		= tools $(ATK_SUBDIR) gdk gtk tests MSVC_Net2005 MSVC_Net2008 win32_installer
-DIST_SUBDIRS	= $(SUBDIRS) demos docs scripts
-
-EXTRA_DIST	= build_shared/Makefile_build.am_fragment \
-		  build_shared/Makefile_build_gensrc.am_fragment \
-		  build_shared/Makefile_gensrc.am_fragment \
-		  build_shared/Makefile_conditional.am_fragment \
-		  CHANGES README.win32 README.SUN PORTING \
-                  autogen.sh \
-                  COPYING COPYING.tools
-
-
-all-local:
-	@echo "*** Everything completed ***"
-
-dist-hook:
-	@echo; echo; \
-	echo "**********************************************************"; \
-	echo "* IMPORTANT NOTICE:                                      *"; \
-	echo "*                                                        *"; \
-	echo "* Be sure you have done a complete build before running  *"; \
-	echo "* 'make dist' or 'make distcheck', because otherwise     *"; \
-	echo "* the tarball will _not_ contain the dependency rules    *"; \
-	echo "* generated by the compiler.                             *"; \
-	echo "**********************************************************"; \
-	echo; echo
-
-
-include $(top_srcdir)/docs/Makefile_web.am_fragment
-
-doc_tarball_files = \
-	docs/index.html docs/FAQ/html docs/images/*.gif \
-	docs/reference/html \
-	docs/tutorial/figures/*.png docs/tutorial/html
-
-# This doesn't work very well in a $(srcdir) != $(builddir) setup,
-# but this target is for maintainer use only anyway.
-
-gtkmm-2-4-docs.tar.gz:
-	tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@
-
-# Upload documentation:
-
-post-html-recursive:
-	list='docs'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
-	done
-
-post-html-local: gtkmm-2-4-docs.tar.gz
-	rsync $(rsync_args) gtkmm-2-4-docs.tar.gz $$USER $(web_host):$(web_path_gtkmm)
-
-post-html: post-html-recursive post-html-local
-
-doc-clean-recursive:
-	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean)
-
-doc-clean: doc-clean-recursive
-
-doc-rebuild:
-	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild)
-
-SVN_REV=`svnversion -n`
-URL_KEY=URL:
-SVN_PATH=`svn info |grep "$(URL_KEY)" |sed -e "s/$(URL_KEY)\s*//"`
-ROOT_KEY=Repository Root:
-SVN_ROOT=`svn info |grep "$(ROOT_KEY)" |sed -e "s/$(ROOT_KEY)\s*//"`
+if GTKMM_ATKMM_ENABLED
+atkmm_includedir = $(includedir)/$(ATKMM_MODULE_NAME)
+atkmm_include_HEADERS = atk/atkmm.h
+endif
 
-tag-release: distcheck
-	@svn cp -r$(SVN_REV) -m "tag $(PACKAGE) $(VERSION)" $(SVN_PATH) $(SVN_ROOT)/tags/$(PACKAGE)-$(VERSION) \
-		|| (echo "Tagging failed.  Do you have local changes that are not committed?" \
-		&& echo "Try running `svn update`." && false)
-	@echo "Release Tagged."
+gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME)
+gdkmm_include_HEADERS = gdk/gdkmm.h
+gdkmm_libincludedir = $(libdir)/$(GDKMM_MODULE_NAME)/include
+nodist_gdkmm_libinclude_HEADERS = gdk/gdkmmconfig.h
 
-release: tag-release
-	scp $(DIST_ARCHIVES) master.gnome.org:
-	@echo "Tarball uploaded.  Now run install-module on master.gnome.org"
+gtkmm_includedir = $(includedir)/$(GTKMM_MODULE_NAME)
+gtkmm_include_HEADERS = gtk/gtkmm.h
+gtkmm_libincludedir = $(libdir)/$(GTKMM_MODULE_NAME)/include
+nodist_gtkmm_libinclude_HEADERS = gtk/gtkmmconfig.h
 
-.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild release tag-release
+pkgconfigdir = $(libdir)/pkgconfig
+nodist_pkgconfig_DATA = $(atk_atkmm_pcfile) gdk/$(GDKMM_MODULE_NAME).pc gtk/$(GTKMM_MODULE_NAME).pc
 
+dist_noinst_SCRIPTS = autogen.sh
+dist_noinst_DATA = CHANGES COPYING.tools PORTING README.SUN README.win32
diff --git a/configure.ac b/configure.ac
index 6b7b7bb..086b69c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([gtk/gtkmm.h])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CONFIG_MACRO_DIR([scripts])
-AC_CONFIG_HEADERS([config.h gtk/gtkmmconfig.h])
+AC_CONFIG_HEADERS([config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h])
 
 MM_INIT_MODULE([atkmm-1.6], m4_expand([AC_PACKAGE_VERSION]))
 MM_INIT_MODULE([gdkmm-2.4], m4_expand([AC_PACKAGE_VERSION]))
@@ -117,7 +117,6 @@ DK_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
                        [G PANGO ATK GDK GDK_PIXBUF GTK])
 
 AC_CONFIG_FILES([
-      atk/Makefile
       atk/atkmm-1.6.pc
       atk/src/Makefile
       atk/atkmm/Makefile
@@ -136,13 +135,11 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([
   Makefile
 
-  gdk/Makefile
   gdk/gdkmm-2.4.pc
     gdk/src/Makefile
     gdk/gdkmm/Makefile
       gdk/gdkmm/private/Makefile
 
-  gtk/Makefile
   gtk/gtkmm-2.4.pc
     gtk/src/Makefile
     gtk/gtkmm/Makefile