[glibmm] Get rid of all Makefile.am in the MSVC dirs

From: Daniel Elstner <daniel src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [glibmm] Get rid of all Makefile.am in the MSVC dirs
Date: Sun, 9 Aug 2009 21:20:59 +0000 (UTC)
commit 90feeb3e3b0f392d418a5a48c3711e5824ab086c
Author: Daniel Elstner <danielk openismus com>
Date:   Sun Aug 9 21:28:11 2009 +0200

    Get rid of all Makefile.am in the MSVC dirs
    
    * MSVC_Net2005/**/Makefile.am: Delete recursive build files.
    * MSVC_Net2008/**/Makefile.am: ditto.
    * MSVC_Net2005/filelist.am: New file.  Recursively list all
    files that should go into the distribution.
    * MSVC_Net2008/filelist.am: ditto.
    * configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs
    to the MSVC subdirectories.  Combine all the remaining output
    files into a single argument to just one AC_CONFIG_FILES call.
    Follow through with a number of TODO comments and remove some
    old cruft which is no longer used anywhere in the module.
    (AC_CONFIG_COMMANDS): Copy the configuration header files into
    the MSVC subdirectories by making config.status execute custom
    configuration commands.  This is easier than doing it at the
    Makefile level, where it was previously implemented.
    * Makefile.am: Include the filelist.am files from the MSVC
    subdirectories.
    (SUBDIRS): Remove MSVC_Net200[58] directories from the list.
    (dist_noinst_DATA): Distribute the MSVC project files.
    * tools/gmmproc.in: Substitute @PERL@ instead of @PERL_PATH  
    * tools/generate_wrap_init.pl.in: ditto.

 ChangeLog                                     |   25 ++++++
 MSVC_Net2005/Makefile.am                      |    3 -
 MSVC_Net2005/examples/Makefile.am             |    3 -
 MSVC_Net2005/examples/dispatcher/Makefile.am  |    1 -
 MSVC_Net2005/examples/dispatcher2/Makefile.am |    1 -
 MSVC_Net2005/examples/markup/Makefile.am      |    1 -
 MSVC_Net2005/examples/options/Makefile.am     |    1 -
 MSVC_Net2005/examples/thread/Makefile.am      |    1 -
 MSVC_Net2005/examples/thread_pool/Makefile.am |    1 -
 MSVC_Net2005/filelist.am                      |   20 +++++
 MSVC_Net2005/gendef/Makefile.am               |    2 -
 MSVC_Net2005/giomm/Makefile.am                |   12 ---
 MSVC_Net2005/glibmm/Makefile.am               |   12 ---
 MSVC_Net2005/tests/Makefile.am                |    4 -
 MSVC_Net2005/tests/giomm_simple/Makefile.am   |    1 -
 MSVC_Net2005/tests/glibmm_value/Makefile.am   |    1 -
 MSVC_Net2008/Makefile.am                      |    3 -
 MSVC_Net2008/examples/Makefile.am             |    3 -
 MSVC_Net2008/examples/dispatcher/Makefile.am  |    1 -
 MSVC_Net2008/examples/dispatcher2/Makefile.am |    1 -
 MSVC_Net2008/examples/markup/Makefile.am      |    1 -
 MSVC_Net2008/examples/options/Makefile.am     |    1 -
 MSVC_Net2008/examples/thread/Makefile.am      |    1 -
 MSVC_Net2008/examples/thread_pool/Makefile.am |    1 -
 MSVC_Net2008/filelist.am                      |   19 +++++
 MSVC_Net2008/gendef/Makefile.am               |    2 -
 MSVC_Net2008/giomm/Makefile.am                |   12 ---
 MSVC_Net2008/glibmm/Makefile.am               |   12 ---
 MSVC_Net2008/tests/Makefile.am                |    4 -
 MSVC_Net2008/tests/giomm_simple/Makefile.am   |    1 -
 MSVC_Net2008/tests/glibmm_value/Makefile.am   |    1 -
 Makefile.am                                   |    9 ++-
 configure.ac                                  |  107 +++++++------------------
 tools/generate_wrap_init.pl.in                |    2 +-
 tools/gmmproc.in                              |    2 +-
 35 files changed, 101 insertions(+), 171 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3520f75..4b5d3a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
 2009-08-09  Daniel Elstner  <danielk openismus com>
 
+	Get rid of all Makefile.am in the MSVC dirs
+
+	* MSVC_Net2005/**/Makefile.am: Delete recursive build files.
+	* MSVC_Net2008/**/Makefile.am: ditto.
+	* MSVC_Net2005/filelist.am: New file.  Recursively list all
+	files that should go into the distribution.
+	* MSVC_Net2008/filelist.am: ditto.
+	* configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs
+	to the MSVC subdirectories.  Combine all the remaining output
+	files into a single argument to just one AC_CONFIG_FILES call.
+	Follow through with a number of TODO comments and remove some
+	old cruft which is no longer used anywhere in the module.
+	(AC_CONFIG_COMMANDS): Copy the configuration header files into
+	the MSVC subdirectories by making config.status execute custom
+	configuration commands.  This is easier than doing it at the
+	Makefile level, where it was previously implemented.
+	* Makefile.am: Include the filelist.am files from the MSVC
+	subdirectories.
+	(SUBDIRS): Remove MSVC_Net200[58] directories from the list.
+	(dist_noinst_DATA): Distribute the MSVC project files.
+	* tools/gmmproc.in: Substitute @PERL@ instead of @PERL_PATH  
+	* tools/generate_wrap_init.pl.in: ditto.
+
+2009-08-09  Daniel Elstner  <danielk openismus com>
+
 	Bring back the giomm reference documentation
 
 	* glib/{src,glibmm}/filelist.am: Add namespace prefix glibmm_
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
new file mode 100644
index 0000000..0e18c15
--- /dev/null
+++ b/MSVC_Net2005/filelist.am
@@ -0,0 +1,20 @@
+## This file is part of glibmm.
+
+msvc_net2005_data =				\
+	README					\
+	blank.cpp				\
+	glibmm.sln				\
+	gendef/gendef.vcproj			\
+	gendef/gendef.cc			\
+	glibmm/glibmm.vcproj			\
+	glibmm/glibmmconfig.h			\
+	giomm/giomm.vcproj			\
+	giomm/giommconfig.h			\
+	tests/giomm_simple/giomm_simple.vcproj	\
+	tests/glibmm_value/glibmm_value.vcproj	\
+	examples/dispatcher/dispatcher.vcproj	\
+	examples/dispatcher2/dispatcher2.vcproj	\
+	examples/markup/markup.vcproj		\
+	examples/options/options.vcproj		\
+	examples/thread/thread.vcproj		\
+	examples/thread_pool/thread_pool.vcproj
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
new file mode 100644
index 0000000..54ff814
--- /dev/null
+++ b/MSVC_Net2008/filelist.am
@@ -0,0 +1,19 @@
+## This file is part of glibmm.
+
+msvc_net2008_data =				\
+	blank.cpp				\
+	glibmm.sln				\
+	gendef/gendef.cc			\
+	gendef/gendef.vcproj			\
+	glibmm/glibmm.vcproj			\
+	glibmm/glibmmconfig.h			\
+	giomm/giomm.vcproj			\
+	giomm/giommconfig.h			\
+	tests/giomm_simple/giomm_simple.vcproj	\
+	tests/glibmm_value/glibmm_value.vcproj	\
+	examples/dispatcher/dispatcher.vcproj	\
+	examples/dispatcher2/dispatcher2.vcproj	\
+	examples/markup/markup.vcproj		\
+	examples/options/options.vcproj		\
+	examples/thread/thread.vcproj		\
+	examples/thread_pool/thread_pool.vcproj
diff --git a/Makefile.am b/Makefile.am
index 4ffbc21..55239eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ doc_subdirs = docs
 else
 doc_subdirs =
 endif
-SUBDIRS = $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs) MSVC_Net2005 MSVC_Net2008
+SUBDIRS = $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs)
 
 glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)
 glibmm_include_HEADERS = glib/glibmm.h
@@ -43,7 +43,12 @@ nodist_giomm_libinclude_HEADERS = gio/giommconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc
 
-dist_noinst_DATA = README.win32 COPYING.tools glib/README gio/README
+include $(srcdir)/MSVC_Net2005/filelist.am
+include $(srcdir)/MSVC_Net2008/filelist.am
+
+text_files = COPYING.tools README.win32 glib/README gio/README
+msvc_files = $(msvc_net2005_data:%=MSVC_Net2005/%) $(msvc_net2008_data:%=MSVC_Net2008/%)
+dist_noinst_DATA = $(text_files) $(msvc_files)
 
 # TODO: Obsolete; remove after grace period.
 aclocal_macrodir = $(datadir)/aclocal
diff --git a/configure.ac b/configure.ac
index 4583944..7a441fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,6 @@
 AC_INIT([glibmm], [2.21.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
-m4_pattern_forbid([^_?MM_])
 
 AC_CONFIG_SRCDIR([glib/glibmm.h])
 AC_CONFIG_AUX_DIR([build])
@@ -69,15 +68,8 @@ PKG_CHECK_MODULES([GIOMM],  [$GIOMM_MODULES])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
 
-# Location to install gmmproc tools
-# TODO: There is no reason for this to be a substitution variable
-AC_SUBST([GMMPROC_DIR], ['${libdir}/glibmm-2.4/proc'])
-
 AC_CHECK_PROGS([M4], [gm4 m4], [m4])
 
-# TODO: Temporary hack
-AC_PATH_PROG([PERL_PATH], [perl], [perl])
-
 # Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE in the header.
 GLIBMM_PROG_CXX_SUN
 
@@ -117,10 +109,6 @@ GLIBMM_CXX_CAN_USE_NAMESPACES_INSIDE_EXTERNC
 GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS
 GLIBMM_C_STD_TIME_T_IS_NOT_INT32
 
-# Create a list of input directories for Doxygen.
-# TODO: kill
-GTKMM_DOXYGEN_INPUT_SUBDIRS([glib gio])
-
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
@@ -134,9 +122,6 @@ MM_ARG_ENABLE_WARNINGS([GLIBMM_WXXFLAGS],
                        [-pedantic -Wall -Wextra],
                        [G])
 
-# TODO: kill dummy
-AC_SUBST([DISABLE_DEPRECATED_CFLAGS], [[]])
-
 #Offer the ability to omit some API from the library, 
 #to reduce the code size:
 GLIBMM_ARG_ENABLE_API_DEPRECATED
@@ -148,68 +133,32 @@ GLIBMM_ARG_ENABLE_API_VFUNCS
 # to reduce the code size:
 GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS
 
-# Dummy conditional just to make automake-1.4 happy.
-# We need an always-false condition in docs/Makefile.am.
-# TODO: kill
-AM_CONDITIONAL(GTKMM_FALSE,[false])
-
-AC_CONFIG_FILES([
-  Makefile
-
-  glib/glibmm-2.4.pc
-    glib/src/Makefile
-    glib/glibmm/Makefile
-  
-  gio/giomm-2.4.pc
-    gio/src/Makefile
-    gio/giomm/Makefile
-
-  tools/Makefile
-  tools/gmmproc
-  tools/generate_wrap_init.pl
-])
-
-AC_CONFIG_FILES([
-  tests/Makefile
-  examples/Makefile
-
-  docs/Makefile
-    docs/reference/Doxyfile
-])
-
-AC_CONFIG_FILES([
-  MSVC_Net2005/Makefile
-    MSVC_Net2005/gendef/Makefile
-    MSVC_Net2005/glibmm/Makefile
-    MSVC_Net2005/glibmm/glibmm.rc
-    MSVC_Net2005/giomm/Makefile
-    MSVC_Net2005/giomm/giomm.rc
-    MSVC_Net2005/examples/Makefile
-      MSVC_Net2005/examples/dispatcher/Makefile
-      MSVC_Net2005/examples/dispatcher2/Makefile
-      MSVC_Net2005/examples/markup/Makefile
-      MSVC_Net2005/examples/options/Makefile
-      MSVC_Net2005/examples/thread/Makefile      
-      MSVC_Net2005/examples/thread_pool/Makefile
-    MSVC_Net2005/tests/Makefile
-      MSVC_Net2005/tests/glibmm_value/Makefile
-      MSVC_Net2005/tests/giomm_simple/Makefile
-
-  MSVC_Net2008/Makefile
-    MSVC_Net2008/gendef/Makefile
-    MSVC_Net2008/glibmm/Makefile
-    MSVC_Net2008/glibmm/glibmm.rc
-    MSVC_Net2008/giomm/Makefile
-    MSVC_Net2008/giomm/giomm.rc
-    MSVC_Net2008/examples/Makefile
-      MSVC_Net2008/examples/dispatcher/Makefile
-      MSVC_Net2008/examples/dispatcher2/Makefile
-      MSVC_Net2008/examples/markup/Makefile
-      MSVC_Net2008/examples/options/Makefile
-      MSVC_Net2008/examples/thread/Makefile      
-      MSVC_Net2008/examples/thread_pool/Makefile
-    MSVC_Net2008/tests/Makefile
-      MSVC_Net2008/tests/glibmm_value/Makefile
-      MSVC_Net2008/tests/giomm_simple/Makefile
-])
+AC_CONFIG_FILES([Makefile
+                 tools/Makefile
+                 tools/gmmproc
+                 tools/generate_wrap_init.pl
+                 glib/glibmm-2.4.pc
+                 glib/src/Makefile
+                 glib/glibmm/Makefile
+                 gio/giomm-2.4.pc
+                 gio/src/Makefile
+                 gio/giomm/Makefile
+                 tests/Makefile
+                 examples/Makefile
+                 docs/Makefile
+                 docs/reference/Doxyfile
+                 MSVC_Net2005/glibmm/glibmm.rc
+                 MSVC_Net2005/giomm/giomm.rc
+                 MSVC_Net2008/glibmm/glibmm.rc
+                 MSVC_Net2008/giomm/giomm.rc])
+
+# Copy the generated configuration headers into the MSVC project directories.
+AC_CONFIG_COMMANDS([MSVC_Net2005/glibmm/glibmmconfig.h],
+                   [cp -f glib/glibmmconfig.h MSVC_Net2005/glibmm/glibmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2005/giomm/giommconfig.h],
+                   [cp -f gio/giommconfig.h MSVC_Net2005/giomm/giommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/glibmm/glibmmconfig.h],
+                   [cp -f glib/glibmmconfig.h MSVC_Net2008/glibmm/glibmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/giomm/giommconfig.h],
+                   [cp -f gio/giommconfig.h MSVC_Net2008/giomm/giommconfig.h])
 AC_OUTPUT
diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in
index 57a9cff..53c16d5 100644
--- a/tools/generate_wrap_init.pl.in
+++ b/tools/generate_wrap_init.pl.in
@@ -1,4 +1,4 @@
-#! @PERL_PATH@
+#! @PERL@
 #
 # @configure_input@
 #
diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index f809817..8c05acb 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -1,4 +1,4 @@
-#! @PERL_PATH@
+#! @PERL@
 #
 # @configure_input@
 #
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]