Mercurial > hg > octave-lyh

changeset 8849:8b7e448d989c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
rename from Makefile.in
rename to Makefile
--- a/configure.in
+++ b/configure.in
@@ -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
+++ b/octMakefile.in
@@ -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; \