Changeset 1785

Timestamp:

Feb 9, 2009, 12:32:52 AM (13 years ago)

Author:

Peter

Message:

Moving m4 files to directory m4/.

NOTE: this change will break makefiles, so you need to issue
'autoreconf -m' (or equivalent) to create sound Makefiles reflecting
this change.

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs)
• build_support/Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4 (added)
• m4/Makefile.am (copied) (copied from trunk/build_support/Makefile.am) (1 diff)
• m4/ac_prog_perl_modules.m4 (moved) (moved from trunk/build_support/ac_prog_perl_modules.m4)
• m4/apr_common.m4 (moved) (moved from trunk/build_support/apr_common.m4)
• m4/apr_license.txt (moved) (moved from trunk/build_support/apr_license.txt)
• m4/ax_boost_base.m4 (moved) (moved from trunk/build_support/ax_boost_base.m4)
• m4/ax_compare_version.m4 (moved) (moved from trunk/build_support/ax_compare_version.m4)
• m4/ax_cxx_check_flag.m4 (moved) (moved from trunk/build_support/ax_cxx_check_flag.m4)
• m4/ax_cxxcpp_check_flag.m4 (moved) (moved from trunk/build_support/ax_cxxcpp_check_flag.m4)
• m4/ax_ld_check_flag.m4 (moved) (moved from trunk/build_support/ax_ld_check_flag.m4)
• m4/gsl.m4 (moved) (moved from trunk/build_support/gsl.m4)
• m4/gsl_license.txt (moved) (moved from trunk/build_support/gsl_license.txt)
• m4/version.m4 (moved) (moved from trunk/build_support/version.m4)
• m4/yat.m4 (moved) (moved from trunk/build_support/yat.m4)
• m4/yat_add_flag.m4 (moved) (moved from trunk/build_support/yat_add_flag.m4)

trunk/Makefile.am

@@ -8 +8 @@
 # Copyright (C) 2006 Jari Häkkinen
 # Copyright (C) 2007 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2008 Peter Johansson
+# Copyright (C) 2008, 2009 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -26 +26 @@
 
 # -I arg should be the same as arg in AC_CONFIG_MACRO_DIR in configure.ac
-ACLOCAL_AMFLAGS = -I build_support --install
+ACLOCAL_AMFLAGS = -I m4 --install
 
-SUBDIRS = build_support yat test doc
+SUBDIRS = build_support m4 yat test doc
 
 .PHONY: doc maintainer-check news-check svn-check svn-clean release

trunk/build_support/Makefile.am

@@ -25 +25 @@
 pkgconfig_DATA= yat.pc
 
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = yat.m4 yat_add_flag.m4
-
 CLEANFILES = yat.pc yat-config
 
-EXTRA_DIST = yat.m4 yat-config.in yat.pc.in 
+EXTRA_DIST = yat-config.in yat.pc.in 
 
 

trunk/configure.ac

@@ -31 +31 @@
 #     autoreconf
 
-m4_include([build_support/version.m4])
+m4_include([m4/version.m4])
 AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
 AC_PREREQ(2.61)
@@ -37 +37 @@
 AC_CONFIG_AUX_DIR([autotools])
 dnl arg below should be the same as in Makefile.am
-AC_CONFIG_MACRO_DIR([build_support])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/usr/local])
 
@@ -303 +303 @@
      doc/doxygen.config
      doc/first_page.doxygen
+     m4/Makefile
      test/Makefile
      test/environment.h

trunk/m4/Makefile.am

@@ -20 +20 @@
 # along with yat. If not, see <http://www.gnu.org/licenses/>.
 
-bin_SCRIPTS=yat-config
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= yat.pc
-
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = yat.m4 yat_add_flag.m4
 
-CLEANFILES = yat.pc yat-config
-
-EXTRA_DIST = yat.m4 yat-config.in yat.pc.in 
-
-
-
-edit = $(SED) \
-  -e 's|@SHELL[@]|$(SHELL)|g' \
-  -e 's|@prefix[@]|$(prefix)|g' \
-  -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
-  -e 's|@bindir[@]|$(bindir)|g' \
-  -e 's|@libdir[@]|$(libdir)|g' \
-  -e 's|@includedir[@]|$(includedir)|g' \
-  -e 's|@CXX[@]|$(CXX)|g' \
-  -e 's|@CXXCPP[@]|$(CXXCPP)|g' \
-  -e 's|@CPPFLAGS[@]|$(CPPFLAGS)|g' \
-  -e 's|@CXXFLAGS[@]|$(CXXFLAGS)|g' \
-  -e 's|@LDFLAGS[@]|$(LDFLAGS)|g' \
-  -e 's|@LIBS[@]|$(LIBS)|g' \
-  -e 's|@EXTRA_CPPFLAGS[@]|$(EXTRA_CPPFLAGS)|g' \
-  -e 's|@EXTRA_CXXFLAGS[@]|$(EXTRA_CXXFLAGS)|g' \
-  -e 's|@EXTRA_LDFLAGS[@]|$(EXTRA_LDFLAGS)|g' \
-  -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
-  -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
-  -e 's|@ECHO[@]|$(ECHO)|g' \
-  -e 's|@VERSION[@]|$(VERSION)|g' \
-  -e 's|@YAT_MAJOR_VERSION[@]|$(YAT_MAJOR_VERSION)|g' \
-  -e 's|@YAT_MINOR_VERSION[@]|$(YAT_MINOR_VERSION)|g' \
-  -e 's|@YAT_PATCH_VERSION[@]|$(YAT_PATCH_VERSION)|g' \
-  -e 's|@YAT_DEV_BUILD[@]|$(YAT_DEV_BUILD)|g' \
-  -e 's|@YAT_LIBNAME[@]|$(YAT_LIBNAME)|g' \
-  -e 's|@gsl_version[@]|$(gsl_version)|g' \
-  -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
-  -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-  -e 's|@boost_version[@]|$(boost_version)|g'
-
-yat-config: Makefile $(srcdir)/yat-config.in
-  @rm -f $@ $@.tmp
-  @$(ECHO) "#! $(SHELL)" > $@.tmp
-  @$(ECHO) "# $@ generated by make from yat-config.in" >> $@.tmp
-  @$(edit) '$(srcdir)/$@.in' >>$@.tmp
-  @chmod +x $@.tmp
-  @chmod a-w $@.tmp
-  @mv $@.tmp $@
-  @$(ECHO) creating $@
-
-yat.pc: Makefile $(srcdir)/yat.pc.in
-  @rm -f $@ $@.tmp
-  @$(ECHO) "# $@ generated by make from yat.pc.in" > $@.tmp
-  @$(edit) '$(srcdir)/$@.in' >>$@.tmp
-  @chmod a-w $@.tmp
-  @mv $@.tmp $@
-  @$(ECHO) creating $@
-
-install-exec-hook:
-  $(SED) 's|installed=no|installed=yes|g' \
-  $(DESTDIR)/$(bindir)/yat-config > $(DESTDIR)/$(bindir)/yat-config.tmp 
-  $(INSTALL) $(DESTDIR)/$(bindir)/yat-config.tmp $(DESTDIR)/$(bindir)/yat-config
-  rm -f $(DESTDIR)/$(bindir)/yat-config.tmp 
-
+EXTRA_DIST = yat.m4