Mercurial > octave-nkf
changeset 8849:8b7e448d989c
Do not autogenerate Makefile from Makefile.in.
| author | Thorsten Meyer <thorsten.meyier@gmx.de> |
|---|---|
| date | Tue, 24 Feb 2009 00:57:01 -0500 |
| parents | 7557cf34ffcd |
| children | 538184c540a9 |
| files | ChangeLog Makefile Makefile.in configure.in octMakefile.in |
| diffstat | 5 files changed, 138 insertions(+), 132 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 23 22:40:11 2009 -0500 +++ b/ChangeLog Tue Feb 24 00:57:01 2009 -0500 @@ -1,3 +1,12 @@ +2009-02-24 Thorsten Meyer <thorsten@hexe> + + * Makefile.in: Rename to Makefile. + * configure.in: Remove Makefile from list of autogenerated + configuration files. + * octMakefile.in: Remove references to Makefile.in, add Makefile + to list of CONF_DISTFILES. + * octMakefile.in (maintainer-clean distclean): Don't delete Makefile. + 2009-02-17 Benjamin Lindner <lindnerb@users.sourceforge.net> * configure.in: Check for mkstemps on MinGW platform
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile Tue Feb 24 00:57:01 2009 -0500 @@ -0,0 +1,125 @@ +# Makefile for octave's src directory +# +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, +# 2005, 2006, 2007 John W. Eaton +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. + +TARGETS = octave-bug octave-config mkoctfile libcruft liboctave \ + dlfcn readline src scripts doc check octave.info \ + INSTALL.OCTAVE BUGS install install-strip uninstall \ + tags TAGS dist conf-dist snapshot snapshot-version \ + .gdbinit run-octave + +NO_DEP_TARGETS = clean mostlyclean distclean maintainer-clean + +all: header-msg config-check + $(MAKE) -f octMakefile all + +$(TARGETS): FORCE + $(MAKE) -f octMakefile $@ + +$(NO_DEP_TARGETS): FORCE + $(MAKE) -f octMakefile omit_deps=true $@ + +# Maybe this message will prevent people from asking why the +# Makefiles don't work for them. Maybe not. + +header-msg: FORCE + @echo "" + @echo "***********************************************************" + @echo "*" + @echo "* To compile Octave, you will need a recent versions of" + @echo "* the following software:" + @echo "*" + @echo "* GNU Make (a recent version)" + @echo "*" + @echo "* g++ (preferably a recent 4.x version, though later" + @echo "* 3.x versions may also work)" + @echo "*" + @echo "* flex (2.5.4 or a more recent version) -- required if" + @echo "* you need to recreate lex.cc from lex.l" + @echo "*" + @echo "* bison (1.31 or a more recent version) -- required if" + @echo "* you need to recreate parse.cc from parse.y" + @echo "*" + @echo "* gperf (3.0.1 or a more recent version) -- required if" + @echo "* you need to recreate oct-gperf.h from octave.gperf" + @echo "*" + @echo "* Now would be a good time to read INSTALL.OCTAVE if" + @echo "* you have not done so already." + @echo "*" + @echo "***********************************************************" + @echo "" + +help: header-msg + @echo "" + @echo "For more information, please read the files INSTALL," + @echo "INSTALL.OCTAVE, and any other system-specific README" + @echo "files that apply (e.g., README.Linux)." + @echo "" + @echo "The following targets are available:" + @echo "" + @echo " all build everything" + @echo " check run self tests" + @echo " install install files" + @echo " install-strip same as install but strip binaries" + @echo " uninstall delete installed files" + @echo "" + @echo " dist create a source distribution" + @echo " conf-dist create a config files distribution" + @echo "" + @echo " clean remove files created by make all" + @echo " mostlyclean remove most files created by make all" + @echo " distclean remove all files not in distribution" + @echo " maintainer-clean clean up everything" + @echo "" + @echo " octave-bug create octave-bug script" + @echo " octave-config create octave-config script" + @echo " mkoctfile create mkoctfile script" + @echo " INSTALL.OCTAVE create INSTALL.OCTAVE doc file" + @echo " BUGS create BUGS doc file" + @echo " tags create tags files" + @echo " TAGS create TAGS files" + @echo "" + @echo " dlfcn make all in subdirectory dlfcn" + @echo " doc make all in subdirectory doc" + @echo " libcruft make all in subdirectory libcruft" + @echo " liboctave make all in subdirectory liboctave" + @echo " scripts make all in subdirectory scripts" + @echo " src make all in subdirectory src" + @echo "" + @echo " help print this message" + @echo "" + +config-check: + @if test -f octMakefile; then \ + true; \ + else \ + echo ""; \ + echo "*** You must run configure before running make."; \ + echo "***"; \ + echo "*** Please read the INSTALL and INSTALL.OCTAVE files"; \ + echo "*** for more information about how to configure and"; \ + echo "*** compile Octave."; \ + echo ""; \ + exit 1; \ + fi + +FORCE: + +.NOTPARALLEL:
--- a/Makefile.in Mon Feb 23 22:40:11 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ -# Makefile for octave's src directory -# -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, -# 2005, 2006, 2007 John W. Eaton -# -# This file is part of Octave. -# -# Octave is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 3 of the License, or (at -# your option) any later version. -# -# Octave is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with Octave; see the file COPYING. If not, see -# <http://www.gnu.org/licenses/>. - -TARGETS = octave-bug octave-config mkoctfile libcruft liboctave \ - dlfcn readline src scripts doc check octave.info \ - INSTALL.OCTAVE BUGS install install-strip uninstall \ - tags TAGS dist conf-dist snapshot snapshot-version \ - .gdbinit run-octave - -NO_DEP_TARGETS = clean mostlyclean distclean maintainer-clean - -all: header-msg config-check - $(MAKE) -f octMakefile all - -$(TARGETS): FORCE - $(MAKE) -f octMakefile $@ - -$(NO_DEP_TARGETS): FORCE - $(MAKE) -f octMakefile omit_deps=true $@ - -# Maybe this message will prevent people from asking why the -# Makefiles don't work for them. Maybe not. - -header-msg: FORCE - @echo "" - @echo "***********************************************************" - @echo "*" - @echo "* To compile Octave, you will need a recent versions of" - @echo "* the following software:" - @echo "*" - @echo "* GNU Make (a recent version)" - @echo "*" - @echo "* g++ (preferably a recent 4.x version, though later" - @echo "* 3.x versions may also work)" - @echo "*" - @echo "* flex (2.5.4 or a more recent version) -- required if" - @echo "* you need to recreate lex.cc from lex.l" - @echo "*" - @echo "* bison (1.31 or a more recent version) -- required if" - @echo "* you need to recreate parse.cc from parse.y" - @echo "*" - @echo "* gperf (3.0.1 or a more recent version) -- required if" - @echo "* you need to recreate oct-gperf.h from octave.gperf" - @echo "*" - @echo "* Now would be a good time to read INSTALL.OCTAVE if" - @echo "* you have not done so already." - @echo "*" - @echo "***********************************************************" - @echo "" - -help: header-msg - @echo "" - @echo "For more information, please read the files INSTALL," - @echo "INSTALL.OCTAVE, and any other system-specific README" - @echo "files that apply (e.g., README.Linux)." - @echo "" - @echo "The following targets are available:" - @echo "" - @echo " all build everything" - @echo " check run self tests" - @echo " install install files" - @echo " install-strip same as install but strip binaries" - @echo " uninstall delete installed files" - @echo "" - @echo " dist create a source distribution" - @echo " conf-dist create a config files distribution" - @echo "" - @echo " clean remove files created by make all" - @echo " mostlyclean remove most files created by make all" - @echo " distclean remove all files not in distribution" - @echo " maintainer-clean clean up everything" - @echo "" - @echo " octave-bug create octave-bug script" - @echo " octave-config create octave-config script" - @echo " mkoctfile create mkoctfile script" - @echo " INSTALL.OCTAVE create INSTALL.OCTAVE doc file" - @echo " BUGS create BUGS doc file" - @echo " tags create tags files" - @echo " TAGS create TAGS files" - @echo "" - @echo " dlfcn make all in subdirectory dlfcn" - @echo " doc make all in subdirectory doc" - @echo " libcruft make all in subdirectory libcruft" - @echo " liboctave make all in subdirectory liboctave" - @echo " scripts make all in subdirectory scripts" - @echo " src make all in subdirectory src" - @echo "" - @echo " help print this message" - @echo "" - -config-check: - @if test -f octMakefile; then \ - true; \ - else \ - echo ""; \ - echo "*** You must run configure before running make."; \ - echo "***"; \ - echo "*** Please read the INSTALL and INSTALL.OCTAVE files"; \ - echo "*** for more information about how to configure and"; \ - echo "*** compile Octave."; \ - echo ""; \ - exit 1; \ - fi - -FORCE: - -.NOTPARALLEL:
--- a/configure.in Mon Feb 23 22:40:11 2009 -0500 +++ b/configure.in Tue Feb 24 00:57:01 2009 -0500 @@ -2102,7 +2102,7 @@ ### Do the substitutions in all the Makefiles. -AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile +AC_CONFIG_FILES([octMakefile Makeconf test/Makefile doc/Makefile doc/faq/Makefile doc/interpreter/Makefile doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile examples/Makefile examples/@polynomial/Makefile liboctave/Makefile
--- a/octMakefile.in Mon Feb 23 22:40:11 2009 -0500 +++ b/octMakefile.in Tue Feb 24 00:57:01 2009 -0500 @@ -33,14 +33,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ -BUILT_CONF_DISTFILES = Makefile - -CONF_DISTFILES = Makefile.in octMakefile.in Makeconf.in \ +CONF_DISTFILES = Makefile octMakefile.in Makeconf.in \ configure configure.in config.guess config.sub aclocal.m4 \ acx_blas.m4 acx_lapack.m4 acx_blas_f77_func.m4 \ config.h.in install-sh autogen.sh -BUILT_DISTFILES = $(BUILT_CONF_DISTFILES) BUGS INSTALL.OCTAVE +BUILT_DISTFILES = BUGS INSTALL.OCTAVE DISTFILES = $(CONF_DISTFILES) \ COPYING INSTALL NEWS \ @@ -163,7 +161,7 @@ .PHONY: clean mostlyclean distclean maintainer-clean maintainer-clean distclean:: - rm -f octMakefile Makefile Makeconf + rm -f octMakefile Makeconf rm -f config.cache config.h config.log config.status rm -rf autom4te.cache rm -f $(SHELL_SCRIPTS) @@ -239,7 +237,6 @@ rm -rf `cat .fname` mkdir `cat .fname` ln $(CONF_DISTFILES) `cat .fname` - ln $(BUILT_CONF_DISTFILES) `cat .fname` for dir in $(CONF_DISTSUBDIRS); do \ mkdir `cat .fname`/$$dir; \ $(MAKE) -C $$dir conf-dist; \