[libsigc++2/variadic_bind3: 40/45] Put bind() in its own bind.h file instead of generating it.

[Murray Cumming <murrayc src gnome org>]

commit e129955f7f7d311467d63dd69571cba60cd8729e
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 2 11:44:08 2016 +0100

    Put bind() in its own bind.h file instead of generating it.

 sigc++/.gitignore                            |    1 -
 sigc++/adaptors/{macros/bind.h.m4 => bind.h} |   29 +++++--------------------
 sigc++/filelist.am                           |    7 ++---
 3 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index 384ef53..d8c2879 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -1,4 +1,3 @@
 /limit_reference.h
-/adaptors/bind.h
 /adaptors/retype.h
 /functors/mem_fun.h
diff --git a/sigc++/adaptors/macros/bind.h.m4 b/sigc++/adaptors/bind.h
similarity index 92%
rename from sigc++/adaptors/macros/bind.h.m4
rename to sigc++/adaptors/bind.h
index 5a082cc..3e69a4c 100644
--- a/sigc++/adaptors/macros/bind.h.m4
+++ b/sigc++/adaptors/bind.h
@@ -1,25 +1,5 @@
-dnl Copyright 2002, The libsigc++ Development Team
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-divert(-1)
-
-include(template.macros.m4)
-
-divert(0)dnl
-_FIREWALL([ADAPTORS_BIND])
+#ifndef _SIGC_ADAPTORS_BIND_H_
+#define _SIGC_ADAPTORS_BIND_H_
 #include <sigc++/adaptors/adaptor_trait.h>
 #include <sigc++/adaptors/bound_argument.h>
 #include <tuple>
@@ -38,9 +18,10 @@ _FIREWALL([ADAPTORS_BIND])
 
 namespace sigc {
 
+
 /** @defgroup bind bind(), bind_return()
  * sigc::bind() alters an arbitrary functor by fixing arguments to certain values.
- * Up to CALL_SIZE arguments can be bound at a time.
+ * Up to 7 arguments can be bound at a time.
  * For single argument binding, overloads of sigc::bind() are provided that let you
  * specify the zero-based position of the argument to fix with the first template parameter.
  * (A value of @p -1 fixes the last argument so sigc::bind<-1>() gives the same result as sigc::bind().)
@@ -340,9 +321,11 @@ bind(const T_functor& _A_func, T_type... _A_b)
 { return bind_functor<-1, T_functor, T_type...>(_A_func, _A_b...);
 }
 
+
 } /* namespace sigc */
 
 #ifdef SIGC_NIL_HAS_BEEN_PUSHED
   #undef SIGC_NIL_HAS_BEEN_PUSHED
   #pragma pop_macro("nil")
 #endif
+#endif /* _SIGC_ADAPTORS_BIND_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 67bc133..2b49389 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -26,11 +26,9 @@ functors_built_cc =
 functors_built_h = mem_fun.h
 
 # Adaptors (adaptors/)
-adaptors_m4 = bind.h.m4 \
-             retype.h.m4
+adaptors_m4 = retype.h.m4
 adaptors_built_cc =
-adaptors_built_h = bind.h \
-                   retype.h
+adaptors_built_h = retype.h
 
 # Combine all the above parts with right directories prefixed
 sigc_m4 = $(base_m4:%=macros/%) \
@@ -64,6 +62,7 @@ sigc_public_h =                               \
        adaptors/adaptor_base.h \
        adaptors/adaptors.h             \
        adaptors/adaptor_trait.h                \
+       adaptors/bind.h \
        adaptors/bind_return.h \
        adaptors/bound_argument.h       \
        adaptors/compose.h \