2 files changed, 12 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 71d72c2..7c1b09e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,8 +130,6 @@ if ENABLE_LIBBINDLE
    include_HEADERS                      += include/bindle.h
    lib_LIBRARIES                        += lib/libbindle.a
 endif
-include_HEADERS                         += include/bindle.h
-lib_LIBRARIES                           += lib/libbindle.a
 
 
 # Makefile includes
@@ -142,16 +140,6 @@ include build-aux/makefile-version.am
 include build-aux/makefile-libbindle.am
 
 
-# macros for lib/libbindle.a
-lib_libbindle_a_DEPENDENCIES            = Makefile \
-                                          config.h \
-                                          $(libbindle_sources)
-lib_libbindle_a_CPPFLAGS                = $(AM_CPPFLAGS) \
-                                          -I$(srcdir)/lib/libbindle
-lib_libbindle_a_CFLAGS                  = $(AM_CFLAGS)
-lib_libbindle_a_SOURCES                 = $(libbindle_sources)
-
-
 # macros for tests/bindle-str-expand
 tests_bindle_str_expand_DEPENDENCIES    = lib/libbindle.a
 tests_bindle_str_expand_LDADD           = lib/libbindle.a
diff --git a/build-aux/makefile-libbindle.am b/build-aux/makefile-libbindle.am
index ade9334..eba8790 100644
--- a/build-aux/makefile-libbindle.am
+++ b/build-aux/makefile-libbindle.am
@@ -28,6 +28,8 @@
 #   SUCH DAMAGE.
 #
 
+include_HEADERS                         += include/bindle.h
+lib_LIBRARIES                           += lib/libbindle.a
 EXTRA_DIST                              += $(bindletools_srcdir)/build-aux/makefile-libbindle.am
 EXTRA_DIST                              += $(bindletools_srcdir)/include/bindle.h
 BUILT_SOURCES                           += include/bindle_prefix.h
@@ -53,6 +55,16 @@ libbindle_sources			=  $(libbindle_files) \
                                            include/bindle_prefix.h
 
 
+# macros for lib/libbindle.a
+lib_libbindle_a_DEPENDENCIES            = Makefile \
+                                          config.h \
+                                          $(libbindle_sources)
+lib_libbindle_a_CPPFLAGS                = $(AM_CPPFLAGS) \
+                                          -I$(srcdir)/lib/libbindle
+lib_libbindle_a_CFLAGS                  = $(AM_CFLAGS)
+lib_libbindle_a_SOURCES                 = $(libbindle_sources)
+
+
 libbindle_symbol_list = $(EGREP) \
         '^[[:space:]]{0,1}bindle_[_[:alnum:]]{1,}[\(\;][[:space:]]{0,}$$' \
         $(libbindle_sources) \