Changeset 1785


Ignore:
Timestamp:
Feb 9, 2009, 12:32:52 AM (11 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:
1 added
3 edited
1 copied
13 moved

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r1673 r1785  
    88# Copyright (C) 2006 Jari Häkkinen
    99# Copyright (C) 2007 Jari Häkkinen, Peter Johansson
    10 # Copyright (C) 2008 Peter Johansson
     10# Copyright (C) 2008, 2009 Peter Johansson
    1111#
    1212# This file is part of the yat library, http://dev.thep.lu.se/yat
     
    2626
    2727# -I arg should be the same as arg in AC_CONFIG_MACRO_DIR in configure.ac
    28 ACLOCAL_AMFLAGS = -I build_support --install
     28ACLOCAL_AMFLAGS = -I m4 --install
    2929
    30 SUBDIRS = build_support yat test doc
     30SUBDIRS = build_support m4 yat test doc
    3131
    3232.PHONY: doc maintainer-check news-check svn-check svn-clean release
  • trunk/build_support/Makefile.am

    r1766 r1785  
    2525pkgconfig_DATA= yat.pc
    2626
    27 aclocaldir = $(datadir)/aclocal
    28 aclocal_DATA = yat.m4 yat_add_flag.m4
    29 
    3027CLEANFILES = yat.pc yat-config
    3128
    32 EXTRA_DIST = yat.m4 yat-config.in yat.pc.in
     29EXTRA_DIST = yat-config.in yat.pc.in
    3330
    3431
  • trunk/configure.ac

    r1769 r1785  
    3131#     autoreconf
    3232
    33 m4_include([build_support/version.m4])
     33m4_include([m4/version.m4])
    3434AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
    3535AC_PREREQ(2.61)
     
    3737AC_CONFIG_AUX_DIR([autotools])
    3838dnl arg below should be the same as in Makefile.am
    39 AC_CONFIG_MACRO_DIR([build_support])
     39AC_CONFIG_MACRO_DIR([m4])
    4040AC_PREFIX_DEFAULT([/usr/local])
    4141
     
    303303     doc/doxygen.config
    304304     doc/first_page.doxygen
     305     m4/Makefile
    305306     test/Makefile
    306307     test/environment.h
  • trunk/m4/Makefile.am

    r1781 r1785  
    2020# along with yat. If not, see <http://www.gnu.org/licenses/>.
    2121
    22 bin_SCRIPTS=yat-config
    23 
    24 pkgconfigdir = $(libdir)/pkgconfig
    25 pkgconfig_DATA= yat.pc
    26 
    2722aclocaldir = $(datadir)/aclocal
    2823aclocal_DATA = yat.m4 yat_add_flag.m4
    2924
    30 CLEANFILES = yat.pc yat-config
    31 
    32 EXTRA_DIST = yat.m4 yat-config.in yat.pc.in
    33 
    34 
    35 
    36 edit = $(SED) \
    37   -e 's|@SHELL[@]|$(SHELL)|g' \
    38   -e 's|@prefix[@]|$(prefix)|g' \
    39   -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
    40   -e 's|@bindir[@]|$(bindir)|g' \
    41   -e 's|@libdir[@]|$(libdir)|g' \
    42   -e 's|@includedir[@]|$(includedir)|g' \
    43   -e 's|@CXX[@]|$(CXX)|g' \
    44   -e 's|@CXXCPP[@]|$(CXXCPP)|g' \
    45   -e 's|@CPPFLAGS[@]|$(CPPFLAGS)|g' \
    46   -e 's|@CXXFLAGS[@]|$(CXXFLAGS)|g' \
    47   -e 's|@LDFLAGS[@]|$(LDFLAGS)|g' \
    48   -e 's|@LIBS[@]|$(LIBS)|g' \
    49   -e 's|@EXTRA_CPPFLAGS[@]|$(EXTRA_CPPFLAGS)|g' \
    50   -e 's|@EXTRA_CXXFLAGS[@]|$(EXTRA_CXXFLAGS)|g' \
    51   -e 's|@EXTRA_LDFLAGS[@]|$(EXTRA_LDFLAGS)|g' \
    52   -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
    53   -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
    54   -e 's|@ECHO[@]|$(ECHO)|g' \
    55   -e 's|@VERSION[@]|$(VERSION)|g' \
    56   -e 's|@YAT_MAJOR_VERSION[@]|$(YAT_MAJOR_VERSION)|g' \
    57   -e 's|@YAT_MINOR_VERSION[@]|$(YAT_MINOR_VERSION)|g' \
    58   -e 's|@YAT_PATCH_VERSION[@]|$(YAT_PATCH_VERSION)|g' \
    59   -e 's|@YAT_DEV_BUILD[@]|$(YAT_DEV_BUILD)|g' \
    60   -e 's|@YAT_LIBNAME[@]|$(YAT_LIBNAME)|g' \
    61   -e 's|@gsl_version[@]|$(gsl_version)|g' \
    62   -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
    63   -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
    64   -e 's|@boost_version[@]|$(boost_version)|g'
    65 
    66 yat-config: Makefile $(srcdir)/yat-config.in
    67   @rm -f $@ $@.tmp
    68   @$(ECHO) "#! $(SHELL)" > $@.tmp
    69   @$(ECHO) "# $@ generated by make from yat-config.in" >> $@.tmp
    70   @$(edit) '$(srcdir)/$@.in' >>$@.tmp
    71   @chmod +x $@.tmp
    72   @chmod a-w $@.tmp
    73   @mv $@.tmp $@
    74   @$(ECHO) creating $@
    75 
    76 yat.pc: Makefile $(srcdir)/yat.pc.in
    77   @rm -f $@ $@.tmp
    78   @$(ECHO) "# $@ generated by make from yat.pc.in" > $@.tmp
    79   @$(edit) '$(srcdir)/$@.in' >>$@.tmp
    80   @chmod a-w $@.tmp
    81   @mv $@.tmp $@
    82   @$(ECHO) creating $@
    83 
    84 install-exec-hook:
    85   $(SED) 's|installed=no|installed=yes|g' \
    86   $(DESTDIR)/$(bindir)/yat-config > $(DESTDIR)/$(bindir)/yat-config.tmp
    87   $(INSTALL) $(DESTDIR)/$(bindir)/yat-config.tmp $(DESTDIR)/$(bindir)/yat-config
    88   rm -f $(DESTDIR)/$(bindir)/yat-config.tmp
    89 
     25EXTRA_DIST = yat.m4
Note: See TracChangeset for help on using the changeset viewer.