diff options
| author | Olly Betts <olly@survex.com> | 2014-02-19 22:35:45 +1300 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2014-02-19 22:35:45 +1300 |
| commit | dcf121f534a5c06d5ccc47bc0b04de982c1df3b2 (patch) | |
| tree | c0aab49ec5d3fcc50011dbf401ff368e5e9c4ca7 | |
| parent | 91461647486b79b055e11b4a15b75e90a0783da1 (diff) | |
| download | swig-dcf121f534a5c06d5ccc47bc0b04de982c1df3b2.tar.gz | |
Make Lib/ocaml/swigp4.ml a non-generated file.
We used to have configure substitute values into it, but that's not been
the case for just over 3 years, since patch #3151788 was applied.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Lib/ocaml/swigp4.ml (renamed from Lib/ocaml/swigp4.ml.in) | 0 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 57 |
4 files changed, 29 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore index eb3aa012c..67a6ee936 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,6 @@ Examples/Makefile Examples/guile/Makefile Examples/test-suite/*/Makefile Examples/xml/Makefile -Lib/ocaml/swigp4.ml /Makefile Source/Include/stamp-h1 Source/Include/swigconfig.h diff --git a/Lib/ocaml/swigp4.ml.in b/Lib/ocaml/swigp4.ml index 2f6074a9e..2f6074a9e 100644 --- a/Lib/ocaml/swigp4.ml.in +++ b/Lib/ocaml/swigp4.ml diff --git a/Makefile.in b/Makefile.in index ea7814242..4407d1316 100644 --- a/Makefile.in +++ b/Makefile.in @@ -391,7 +391,7 @@ clean-ccache: # DISTCLEAN - clean what configure built ##################################################################### -DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig Lib/ocaml/swigp4.ml +DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig distclean-helper: distclean-test-suite distclean-examples distclean-dead diff --git a/configure.ac b/configure.ac index bb62068ae..be4e6e3c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2409,35 +2409,34 @@ case $build in esac AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) -AC_CONFIG_FILES([ \ - Makefile \ - swig.spec \ - Source/Makefile \ - Examples/Makefile \ - Examples/xml/Makefile \ - Examples/test-suite/errors/Makefile \ - Examples/test-suite/chicken/Makefile \ - Examples/test-suite/csharp/Makefile \ - Examples/test-suite/d/Makefile \ - Examples/test-suite/guile/Makefile \ - Examples/test-suite/java/Makefile \ - Examples/test-suite/mzscheme/Makefile \ - Examples/test-suite/ocaml/Makefile \ - Examples/test-suite/octave/Makefile \ - Examples/test-suite/perl5/Makefile \ - Examples/test-suite/php/Makefile \ - Examples/test-suite/pike/Makefile \ - Examples/test-suite/python/Makefile \ - Examples/test-suite/ruby/Makefile \ - Examples/test-suite/tcl/Makefile \ - Examples/test-suite/lua/Makefile \ - Examples/test-suite/allegrocl/Makefile \ - Examples/test-suite/clisp/Makefile \ - Examples/test-suite/cffi/Makefile \ - Examples/test-suite/uffi/Makefile \ - Examples/test-suite/r/Makefile \ - Examples/test-suite/go/Makefile \ - Lib/ocaml/swigp4.ml +AC_CONFIG_FILES([ + Makefile + swig.spec + Source/Makefile + Examples/Makefile + Examples/xml/Makefile + Examples/test-suite/errors/Makefile + Examples/test-suite/chicken/Makefile + Examples/test-suite/csharp/Makefile + Examples/test-suite/d/Makefile + Examples/test-suite/guile/Makefile + Examples/test-suite/java/Makefile + Examples/test-suite/mzscheme/Makefile + Examples/test-suite/ocaml/Makefile + Examples/test-suite/octave/Makefile + Examples/test-suite/perl5/Makefile + Examples/test-suite/php/Makefile + Examples/test-suite/pike/Makefile + Examples/test-suite/python/Makefile + Examples/test-suite/ruby/Makefile + Examples/test-suite/tcl/Makefile + Examples/test-suite/lua/Makefile + Examples/test-suite/allegrocl/Makefile + Examples/test-suite/clisp/Makefile + Examples/test-suite/cffi/Makefile + Examples/test-suite/uffi/Makefile + Examples/test-suite/r/Makefile + Examples/test-suite/go/Makefile ]) AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) AC_CONFIG_FILES([CCache/ccache_swig_config.h]) |