GNOME.org
 

[libsigc++2] Do not recurse into MSVC subdirectories

commit 52274a3041e6e46aa951f74734eedd0e9cbedea9
Author: Daniel Elstner <danielk openismus com>
Date:   Tue Aug 11 10:06:13 2009 +0200

    Do not recurse into MSVC subdirectories
    
    * MSVC_Net200[58]/filelist.am: New Automake include files, defining
    the lists of files to ship from the MSVC project directories.
    * MSVC_Net200[58]/Makefile.am: Delete recursive Makefile.am files.
    * Makefile.am: Include MSVC_Net200[58]/filelist.am.
    (dist_noinst_DATA): Distribute MSVC project files.
    (SUBDIRS): Do not recurse into the MSVC_Net200[58] subdirectories.
    * configure.ac (AC_CONFIG_FILES): Remove the output files
    MSVC_Net200[58]/Makefile.am from the list.
    (AC_CONFIG_COMMANDS): Copy sigc++config.h into the MSVC project
    directories at the end of config.status.

 ChangeLog                |   15 ++++++++++++++
 MSVC_Net2005/Makefile.am |   47 ----------------------------------------------
 MSVC_Net2005/filelist.am |   28 +++++++++++++++++++++++++++
 MSVC_Net2008/Makefile.am |   47 ----------------------------------------------
 MSVC_Net2008/filelist.am |   28 +++++++++++++++++++++++++++
 Makefile.am              |   15 +++++++++++--
 configure.ac             |    8 +++++-
 7 files changed, 89 insertions(+), 99 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 024e948..bbcaeec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2009-08-11  Daniel Elstner  <danielk openismus com>
 
+	Do not recurse into MSVC subdirectories
+
+	* MSVC_Net200[58]/filelist.am: New Automake include files, defining
+	the lists of files to ship from the MSVC project directories.
+	* MSVC_Net200[58]/Makefile.am: Delete recursive Makefile.am files.
+	* Makefile.am: Include MSVC_Net200[58]/filelist.am.
+	(dist_noinst_DATA): Distribute MSVC project files.
+	(SUBDIRS): Do not recurse into the MSVC_Net200[58] subdirectories.
+	* configure.ac (AC_CONFIG_FILES): Remove the output files
+	MSVC_Net200[58]/Makefile.am from the list.
+	(AC_CONFIG_COMMANDS): Copy sigc++config.h into the MSVC project
+	directories at the end of config.status.
+
+2009-08-11  Daniel Elstner  <danielk openismus com>
+
 	Remove now superfluous doctool overrides
 
 	* docs/Makefile.am: Remove overrides for the documentation
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
new file mode 100644
index 0000000..bd3e801
--- /dev/null
+++ b/MSVC_Net2005/filelist.am
@@ -0,0 +1,28 @@
+## This file is part of libsigc++.
+
+msvc_net2005_data =								\
+	blank.cpp								\
+	libsigc++2.sln								\
+	libsigc++2.vcproj							\
+	sigc++config.h								\
+	sigc-2.0.rc								\
+	tests/test_accumulated/test_accumulated.vcproj				\
+	tests/test_bind/test_bind.vcproj					\
+	tests/test_bind_return/test_bind_return.vcproj				\
+	tests/test_compatibility/test_compatibility.vcproj			\
+	tests/test_compose/test_compose.vcproj					\
+	tests/test_deduce_result_type/test_deduce_result_type.vcproj		\
+	tests/test_disconnect/test_disconnect.vcproj				\
+	tests/test_disconnect_during_emit/test_disconnect_during_emit.vcproj	\
+	tests/test_exception_catch/test_exception_catch.vcproj			\
+	tests/test_functor_trait/test_functor_trait.vcproj			\
+	tests/test_hide/test_hide.vcproj					\
+	tests/test_lambda/test_lambda.vcproj					\
+	tests/test_mem_fun/test_mem_fun.vcproj					\
+	tests/test_ptr_fun/test_ptr_fun.vcproj					\
+	tests/test_retype/test_retype.vcproj					\
+	tests/test_retype_return/test_retype_return.vcproj			\
+	tests/test_signal/test_signal.vcproj					\
+	tests/test_size/test_size.vcproj					\
+	tests/test_slot/test_slot.vcproj					\
+	tests/test_trackable/test_trackable.vcproj
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
new file mode 100644
index 0000000..5937bc3
--- /dev/null
+++ b/MSVC_Net2008/filelist.am
@@ -0,0 +1,28 @@
+## This file is part of libsigc++.
+
+msvc_net2008_data =								\
+	blank.cpp								\
+	libsigc++2.sln								\
+	libsigc++2.vcproj							\
+	sigc++config.h								\
+	sigc-2.0.rc								\
+	tests/test_accumulated/test_accumulated.vcproj				\
+	tests/test_bind/test_bind.vcproj					\
+	tests/test_bind_return/test_bind_return.vcproj				\
+	tests/test_compatibility/test_compatibility.vcproj			\
+	tests/test_compose/test_compose.vcproj					\
+	tests/test_deduce_result_type/test_deduce_result_type.vcproj		\
+	tests/test_disconnect/test_disconnect.vcproj				\
+	tests/test_disconnect_during_emit/test_disconnect_during_emit.vcproj	\
+	tests/test_exception_catch/test_exception_catch.vcproj			\
+	tests/test_functor_trait/test_functor_trait.vcproj			\
+	tests/test_hide/test_hide.vcproj					\
+	tests/test_lambda/test_lambda.vcproj					\
+	tests/test_mem_fun/test_mem_fun.vcproj					\
+	tests/test_ptr_fun/test_ptr_fun.vcproj					\
+	tests/test_retype/test_retype.vcproj					\
+	tests/test_retype_return/test_retype_return.vcproj			\
+	tests/test_signal/test_signal.vcproj					\
+	tests/test_size/test_size.vcproj					\
+	tests/test_slot/test_slot.vcproj					\
+	tests/test_trackable/test_trackable.vcproj
diff --git a/Makefile.am b/Makefile.am
index cd17475..358ef6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,9 @@ doc_subdirs = docs
 else
 doc_subdirs =
 endif
-SUBDIRS = sigc++ tests examples $(doc_subdirs) MSVC_Net2005 MSVC_Net2008
+SUBDIRS = sigc++ tests examples $(doc_subdirs)
 
-sigc_configdir = $(libdir)/sigc++-2.0/include
+sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
 nodist_sigc_config_HEADERS = sigc++config.h
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -33,7 +33,16 @@ noinst_DATA = sigc++-2.0-uninstalled.pc
 
 dist_noinst_SCRIPTS = autogen.sh
 
+include $(srcdir)/MSVC_Net2005/filelist.am
+include $(srcdir)/MSVC_Net2008/filelist.am
+
+msvc_files = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \
+	     $(addprefix MSVC_Net2008/,$(msvc_net2008_data))
+
 dist_noinst_DATA =			\
 	scripts/doc-install.pl		\
 	scripts/doc-postprocess.pl	\
-	scripts/tagfile-to-devhelp2.xsl
+	scripts/tagfile-to-devhelp2.xsl	\
+	$(msvc_files)
+
+DISTCLEANFILES = MSVC_Net2005/sigc++config.h MSVC_Net2008/sigc++config.h
diff --git a/configure.ac b/configure.ac
index 238a215..d8b23ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,12 @@ AC_CONFIG_FILES([Makefile
                  tests/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2005/Makefile
                  MSVC_Net2005/sigc-2.0.rc
-                 MSVC_Net2008/Makefile
                  MSVC_Net2008/sigc-2.0.rc])
+
+# Copy the generated configuration headers into the MSVC project directories.
+AC_CONFIG_COMMANDS([MSVC_Net2005/sigc++config.h],
+                   [cp -f sigc++config.h MSVC_Net2005/sigc++config.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/sigc++config.h],
+                   [cp -f sigc++config.h MSVC_Net2008/sigc++config.h])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]