Move all .m4 files into new subdirectories sigc++/[...]/macros. Install

2003-11-02  Martin Schulze  <teebaum@cvs.gnome.org>

	* Move all .m4 files into new subdirectories
	sigc++/[...]/macros. Install the .m4 files on
	"make install" (Reported by Ron Steinke).

28 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index af8947f..2f9f821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-02  Martin Schulze  <teebaum@cvs.gnome.org>
+
+	* Move all .m4 files into new subdirectories
+	sigc++/[...]/macros. Install the .m4 files on
+	"make install" (Reported by Ron Steinke).
+
 2003-11-01  Martin Schulze  <teebaum@cvs.gnome.org>
 
 	* sigc++/[class,method,object]_slot.h.m4: Include
diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
index 06afc9b..56ff8af 100644
--- a/sigc++/Makefile.am
+++ b/sigc++/Makefile.am
@@ -37,15 +37,15 @@ build_subdirs = functors adaptors adaptors/lambda
 sigc_m4 = $(base_m4:%=macros/%) \
 	  $(functors_m4:%=functors/macros/%) \
           $(adaptors_m4:%=adaptors/macros/%) \
-          $(lambda_m4:%=adaptors/lambda/macros/%) 
-sigc_built_cc = $(base_built_cc:%=macros/%) \
-	  $(functors_built_cc:%=functors/macros/%) \
-          $(adaptors_built_cc:%=adaptors/macros/%) \
-          $(lambda_built_cc:%=adaptors/lambda/macros/%) 
+          $(lambda_m4:%=adaptors/lambda/macros/%)
+sigc_built_cc = $(base_built_cc) \
+	  $(functors_built_cc:%=functors/%) \
+          $(adaptors_built_cc:%=adaptors/%) \
+          $(lambda_built_cc:%=adaptors/lambda/%)
 sigc_built_h = $(base_built_h) \
 	  $(functors_built_h:%=functors/%) \
           $(adaptors_built_h:%=adaptors/%) \
-          $(lambda_built_h:%=adaptors/lambda/%) 
+          $(lambda_built_h:%=adaptors/lambda/%)
 
 EXTRA_DIST = $(sigc_m4) $(sigc_built_h) $(sigc_built_cc)
 
diff --git a/sigc++/adaptors/lambda/base.h.m4 b/sigc++/adaptors/lambda/macros/base.h.m4
index 7f06259..7f06259 100644
--- a/sigc++/adaptors/lambda/base.h.m4
+++ b/sigc++/adaptors/lambda/macros/base.h.m4
diff --git a/sigc++/adaptors/lambda/group.h.m4 b/sigc++/adaptors/lambda/macros/group.h.m4
index e394749..e394749 100644
--- a/sigc++/adaptors/lambda/group.h.m4
+++ b/sigc++/adaptors/lambda/macros/group.h.m4
diff --git a/sigc++/adaptors/lambda/lambda.cc.m4 b/sigc++/adaptors/lambda/macros/lambda.cc.m4
index c7aed57..c7aed57 100644
--- a/sigc++/adaptors/lambda/lambda.cc.m4
+++ b/sigc++/adaptors/lambda/macros/lambda.cc.m4
diff --git a/sigc++/adaptors/lambda/operator.h.m4 b/sigc++/adaptors/lambda/macros/operator.h.m4
index 2b1ba23..2b1ba23 100644
--- a/sigc++/adaptors/lambda/operator.h.m4
+++ b/sigc++/adaptors/lambda/macros/operator.h.m4
diff --git a/sigc++/adaptors/lambda/select.h.m4 b/sigc++/adaptors/lambda/macros/select.h.m4
index 906d719..906d719 100644
--- a/sigc++/adaptors/lambda/select.h.m4
+++ b/sigc++/adaptors/lambda/macros/select.h.m4
diff --git a/sigc++/adaptors/adaptor_trait.h.m4 b/sigc++/adaptors/macros/adaptor_trait.h.m4
index 1e12c7c..1e12c7c 100644
--- a/sigc++/adaptors/adaptor_trait.h.m4
+++ b/sigc++/adaptors/macros/adaptor_trait.h.m4
diff --git a/sigc++/adaptors/bind.h.m4 b/sigc++/adaptors/macros/bind.h.m4
index f14e930..f14e930 100644
--- a/sigc++/adaptors/bind.h.m4
+++ b/sigc++/adaptors/macros/bind.h.m4
diff --git a/sigc++/adaptors/bind_return.h.m4 b/sigc++/adaptors/macros/bind_return.h.m4
index f6eb3ab..f6eb3ab 100644
--- a/sigc++/adaptors/bind_return.h.m4
+++ b/sigc++/adaptors/macros/bind_return.h.m4
diff --git a/sigc++/adaptors/compose.h.m4 b/sigc++/adaptors/macros/compose.h.m4
index 15b2473..15b2473 100644
--- a/sigc++/adaptors/compose.h.m4
+++ b/sigc++/adaptors/macros/compose.h.m4
diff --git a/sigc++/adaptors/deduce_result_type.h.m4 b/sigc++/adaptors/macros/deduce_result_type.h.m4
index 9004032..9004032 100644
--- a/sigc++/adaptors/deduce_result_type.h.m4
+++ b/sigc++/adaptors/macros/deduce_result_type.h.m4
diff --git a/sigc++/adaptors/exception_catch.h.m4 b/sigc++/adaptors/macros/exception_catch.h.m4
index 4f7a561..4f7a561 100644
--- a/sigc++/adaptors/exception_catch.h.m4
+++ b/sigc++/adaptors/macros/exception_catch.h.m4
diff --git a/sigc++/adaptors/hide.h.m4 b/sigc++/adaptors/macros/hide.h.m4
index b8f9fe8..b8f9fe8 100644
--- a/sigc++/adaptors/hide.h.m4
+++ b/sigc++/adaptors/macros/hide.h.m4
diff --git a/sigc++/adaptors/retype.h.m4 b/sigc++/adaptors/macros/retype.h.m4
index 2d95bd6..2d95bd6 100644
--- a/sigc++/adaptors/retype.h.m4
+++ b/sigc++/adaptors/macros/retype.h.m4
diff --git a/sigc++/adaptors/retype_return.h.m4 b/sigc++/adaptors/macros/retype_return.h.m4
index d01f17d..d01f17d 100644
--- a/sigc++/adaptors/retype_return.h.m4
+++ b/sigc++/adaptors/macros/retype_return.h.m4
diff --git a/sigc++/functors/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4
index b957db1..b957db1 100644
--- a/sigc++/functors/functor_trait.h.m4
+++ b/sigc++/functors/macros/functor_trait.h.m4
diff --git a/sigc++/functors/mem_fun.h.m4 b/sigc++/functors/macros/mem_fun.h.m4
index 44b796b..44b796b 100644
--- a/sigc++/functors/mem_fun.h.m4
+++ b/sigc++/functors/macros/mem_fun.h.m4
diff --git a/sigc++/functors/ptr_fun.h.m4 b/sigc++/functors/macros/ptr_fun.h.m4
index 9f8f57d..9f8f57d 100644
--- a/sigc++/functors/ptr_fun.h.m4
+++ b/sigc++/functors/macros/ptr_fun.h.m4
diff --git a/sigc++/functors/slot.h.m4 b/sigc++/functors/macros/slot.h.m4
index 0660f81..0660f81 100644
--- a/sigc++/functors/slot.h.m4
+++ b/sigc++/functors/macros/slot.h.m4
diff --git a/sigc++/class_slot.h.m4 b/sigc++/macros/class_slot.h.m4
index 346f707..346f707 100644
--- a/sigc++/class_slot.h.m4
+++ b/sigc++/macros/class_slot.h.m4
diff --git a/sigc++/hide.h.m4 b/sigc++/macros/hide.h.m4
index 1240f67..1240f67 100644
--- a/sigc++/hide.h.m4
+++ b/sigc++/macros/hide.h.m4
diff --git a/sigc++/method_slot.h.m4 b/sigc++/macros/method_slot.h.m4
index 09732ae..09732ae 100644
--- a/sigc++/method_slot.h.m4
+++ b/sigc++/macros/method_slot.h.m4
diff --git a/sigc++/object_slot.h.m4 b/sigc++/macros/object_slot.h.m4
index 3c98b0a..3c98b0a 100644
--- a/sigc++/object_slot.h.m4
+++ b/sigc++/macros/object_slot.h.m4
diff --git a/sigc++/retype.h.m4 b/sigc++/macros/retype.h.m4
index d49c066..d49c066 100644
--- a/sigc++/retype.h.m4
+++ b/sigc++/macros/retype.h.m4
diff --git a/sigc++/signal.h.m4 b/sigc++/macros/signal.h.m4
index b045ee5..b045ee5 100644
--- a/sigc++/signal.h.m4
+++ b/sigc++/macros/signal.h.m4
diff --git a/sigc++/slot.h.m4 b/sigc++/macros/slot.h.m4
index 72a969b..72a969b 100644
--- a/sigc++/slot.h.m4
+++ b/sigc++/macros/slot.h.m4
diff --git a/sigc++/template.macros.m4 b/sigc++/macros/template.macros.m4
index 72ee30c..72ee30c 100644
--- a/sigc++/template.macros.m4
+++ b/sigc++/macros/template.macros.m4