* Makefile.am (ACLOCAL_AMFLAGS): s/build-aux/m4/. * configure.ac: Add AC_CONFIG_MACRO_DIR([m4]). * m4/: New directory. * build-aux/cfitsio.m4, * build-aux/freeimageplus.m4, * build-aux/pypath.m4, * build-aux/swig.m4, * build-aux/trimesh.m4, * build-aux/with-swilena.m4: Move files... * m4/cfitsio.m4, * m4/freeimageplus.m4, * m4/pypath.m4, * m4/swig.m4, * m4/trimesh.m4, * m4/with-swilena.m4: ...here. * m4/.gitignore: New. * build-aux/.gitignore: Adjust. --- ChangeLog | 24 ++++++++++++++++++++++++ Makefile.am | 2 +- build-aux/.gitignore | 5 ----- configure.ac | 3 +++ m4/.gitignore | 5 +++++ {build-aux => m4}/cfitsio.m4 | 0 {build-aux => m4}/freeimageplus.m4 | 0 {build-aux => m4}/pypath.m4 | 0 {build-aux => m4}/swig.m4 | 0 {build-aux => m4}/trimesh.m4 | 0 {build-aux => m4}/with-swilena.m4 | 0 11 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 m4/.gitignore rename {build-aux => m4}/cfitsio.m4 (100%) rename {build-aux => m4}/freeimageplus.m4 (100%) rename {build-aux => m4}/pypath.m4 (100%) rename {build-aux => m4}/swig.m4 (100%) rename {build-aux => m4}/trimesh.m4 (100%) rename {build-aux => m4}/with-swilena.m4 (100%) diff --git a/ChangeLog b/ChangeLog index 4fa9ea5..90a0af3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2009-02-04 Roland Levillain <roland@lrde.epita.fr> + + Move M4 files into m4/. + + * Makefile.am (ACLOCAL_AMFLAGS): s/build-aux/m4/. + * configure.ac: Add AC_CONFIG_MACRO_DIR([m4]). + * m4/: New directory. + * build-aux/cfitsio.m4, + * build-aux/freeimageplus.m4, + * build-aux/pypath.m4, + * build-aux/swig.m4, + * build-aux/trimesh.m4, + * build-aux/with-swilena.m4: + Move files... + * m4/cfitsio.m4, + * m4/freeimageplus.m4, + * m4/pypath.m4, + * m4/swig.m4, + * m4/trimesh.m4, + * m4/with-swilena.m4: + ...here. + * m4/.gitignore: New. + * build-aux/.gitignore: Adjust. + 2009-02-04 Frederic Bour <bour@lrde.epita.fr> [sandbox][bour] Backup of accuprops.cc. diff --git a/Makefile.am b/Makefile.am index 175def0..814551a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- -ACLOCAL_AMFLAGS = -I build-aux +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = build-aux external milena diff --git a/build-aux/.gitignore b/build-aux/.gitignore index 72875a8..d96c228 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -5,13 +5,8 @@ /*.elc /elisp-comp /install-sh -/libtool.m4 /*.log /ltmain.sh -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 /*Makefile /*Makefile?in /mdate-sh diff --git a/configure.ac b/configure.ac index b9bfb63..260baaa 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,9 @@ AC_PREREQ([2.61]) AC_INIT([Olena], [1.0], [olena@lrde.epita.fr], [olena]) +# M4 macros. +AC_CONFIG_MACRO_DIR([m4]) + # Auxiliary files. AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..94e6f26 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +/libtool.m4 +/ltoptions.m4 +/ltsugar.m4 +/ltversion.m4 +/lt~obsolete.m4 diff --git a/build-aux/cfitsio.m4 b/m4/cfitsio.m4 similarity index 100% rename from build-aux/cfitsio.m4 rename to m4/cfitsio.m4 diff --git a/build-aux/freeimageplus.m4 b/m4/freeimageplus.m4 similarity index 100% rename from build-aux/freeimageplus.m4 rename to m4/freeimageplus.m4 diff --git a/build-aux/pypath.m4 b/m4/pypath.m4 similarity index 100% rename from build-aux/pypath.m4 rename to m4/pypath.m4 diff --git a/build-aux/swig.m4 b/m4/swig.m4 similarity index 100% rename from build-aux/swig.m4 rename to m4/swig.m4 diff --git a/build-aux/trimesh.m4 b/m4/trimesh.m4 similarity index 100% rename from build-aux/trimesh.m4 rename to m4/trimesh.m4 diff --git a/build-aux/with-swilena.m4 b/m4/with-swilena.m4 similarity index 100% rename from build-aux/with-swilena.m4 rename to m4/with-swilena.m4 -- 1.6.1.2