Mercurial > octave
changeset 1146:b78e479dbf16
[project @ 1995-02-26 22:01:22 by jwe]
| author | jwe |
|---|---|
| date | Sun, 26 Feb 1995 22:07:02 +0000 |
| parents | 185b16c1be3d |
| children | 06721d665ba6 |
| files | Makefile.in configure.in octMakefile.in |
| diffstat | 3 files changed, 19 insertions(+), 143 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Feb 26 06:20:18 1995 +0000 +++ b/Makefile.in Sun Feb 26 22:07:02 1995 +0000 @@ -26,133 +26,16 @@ @echo "" $(MAKE) -f octMakefile all -octave-bug: FORCE - $(MAKE) -f octMakefile octave-bug - -libcruft: FORCE - $(MAKE) -f octMakefile libcruft - -liboctave: FORCE - $(MAKE) -f octMakefile liboctave - -kpathsea: FORCE - $(MAKE) -f octMakefile kpathsea - -dld: FORCE - $(MAKE) -f octMakefile dld - -info: FORCE - $(MAKE) -f octMakefile info - -readline: FORCE - $(MAKE) -f octMakefile readline - -src: FORCE - $(MAKE) -f octMakefile src - -scripts: FORCE - $(MAKE) -f octMakefile scripts - -doc: FORCE - $(MAKE) -f octMakefile doc - -check: FORCE - $(MAKE) -f octMakefile check - -octave.info: FORCE - $(MAKE) -f octMakefile octave.info - -INSTALL.info: FORCE - $(MAKE) -f octMakefile INSTALL.info - -BUGS.info: FORCE - $(MAKE) -f octMakefile BUGS.info - -install: FORCE - $(MAKE) -f octMakefile install - -uninstall: FORCE - $(MAKE) -f octMakefile uninstall - -tags: FORCE - $(MAKE) -f octMakefile tags - -TAGS: FORCE - $(MAKE) -f octMakefile TAGS - -clean: FORCE - $(MAKE) -f octMakefile clean - -mostlyclean: FORCE - $(MAKE) -f octMakefile mostlyclean - -distclean: FORCE - $(MAKE) -f octMakefile distclean +TARGETS = octave-bug libcruft liboctave kpathsea dld info readline \ + src scripts doc check octave.info INSTALL.info BUGS.info \ + install uninstall tags TAGS clean mostlyclean distclean \ + realclean clean-tar dist-z links-for-dist dist-tar \ + clean-dist-tar dist links-for-bin-dist bin-dist-tar \ + clean-bin-dist-tar binary-dist doc-dist-tar clean-doc-dist-tar \ + doc-dist local-dist-tar clean-local-dist-tar local-dist \ + split-dist split-local-dist snapshot-z snapshot snapshot-version -realclean: FORCE - $(MAKE) -f octMakefile realclean - -clean-tar: FORCE - $(MAKE) -f octMakefile clean-tar - -dist-z: FORCE - $(MAKE) -f octMakefile dist-z - -links-for-dist: FORCE - $(MAKE) -f octMakefile links-for-dist - -dist-tar: FORCE - $(MAKE) -f octMakefile dist-tar - -clean-dist-tar: FORCE - $(MAKE) -f octMakefile clean-dist-tar - -dist: FORCE - $(MAKE) -f octMakefile dist - -links-for-bin-dist: FORCE - $(MAKE) -f octMakefile links-for-bin-dist - -bin-dist-tar: FORCE - $(MAKE) -f octMakefile bin-dist-tar - -clean-bin-dist-tar: FORCE - $(MAKE) -f octMakefile clean-bin-dist-tar - -binary-dist: FORCE - $(MAKE) -f octMakefile binary-dist +$(TARGETS): FORCE + $(MAKE) -f octMakefile $@ -doc-dist-tar: FORCE - $(MAKE) -f octMakefile doc-dist-tar - -clean-doc-dist-tar: FORCE - $(MAKE) -f octMakefile clean-doc-dist-tar - -doc-dist: FORCE - $(MAKE) -f octMakefile doc-dist - -local-dist-tar: FORCE - $(MAKE) -f octMakefile local-dist-tar - -clean-local-dist-tar: FORCE - $(MAKE) -f octMakefile clean-local-dist-tar - -local-dist: FORCE - $(MAKE) -f octMakefile local-dist - -split-dist: FORCE - $(MAKE) -f octMakefile split-dist - -split-local-dist: FORCE - $(MAKE) -f octMakefile split-local-dist - -snapshot-z: FORCE - $(MAKE) -f octMakefile snapshot-z - -snapshot: FORCE - $(MAKE) -f octMakefile snapshot - -snapshot-version: FORCE - $(MAKE) -f octMakefile snapshot-version - -FORCE: +FORCE:
--- a/configure.in Sun Feb 26 06:20:18 1995 +0000 +++ b/configure.in Sun Feb 26 22:07:02 1995 +0000 @@ -21,10 +21,10 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -AC_REVISION($Revision: 1.96 $) +AC_REVISION($Revision: 1.97 $) AC_PREREQ(2.0) AC_INIT(src/octave.cc) -AC_CONFIG_HEADER(config.h kpathsea/c-auto.h) +AC_CONFIG_HEADER(config.h) AC_DEFINE(OCTAVE_SOURCE, 1) @@ -375,17 +375,6 @@ ### Does the C compiler handle alloca() and const correctly? AC_ALLOCA - -### This one is for kpathsea. -### -### It would be nicer to test for the requisite putenv features directly, -### but can't figure out how to do that. - -if test "`(uname) 2>/dev/null`" = NetBSD \ - || test "`(uname) 2>/dev/null`" = FreeBSD; then - AC_DEFINE(SMART_PUTENV) -fi - AC_C_CONST ### If we haven't been forced to use f2c, try to find a Fortran compiler @@ -782,6 +771,10 @@ AC_MSG_RESULT([adding -Wall to CFLAGS]) fi +### Run configure in subdirectories. + +AC_CONFIG_SUBDIRS(kpathsea) + ### Do the substitutions in all the Makefiles. define([tmpA], [Makefile octMakefile Makeconf])dnl @@ -789,7 +782,7 @@ define([tmpC], [liboctave/Makefile src/Makefile dld/Makefile])dnl define([tmpD], [info/Makefile readline/Makefile readline/doc/Makefile])dnl define([tmpE], [readline/examples/Makefile doc/Makefile])dnl -define([tmpF], [test/Makefile kpathsea/Makefile])dnl +define([tmpF], [test/Makefile])dnl define([srcdirs], [tmpA tmpB tmpC tmpD tmpE tmpF])dnl define([tmpa], [libcruft/blas/Makefile libcruft/balgen/Makefile])dnl
--- a/octMakefile.in Sun Feb 26 06:20:18 1995 +0000 +++ b/octMakefile.in Sun Feb 26 22:07:02 1995 +0000 @@ -27,7 +27,7 @@ MAKEINFO.PATCH ChangeLog ChangeLog.[0-9] # Complete directory trees to distribute. -DISTDIRS = kpathsea +DISTDIRS = kpathsea make # Subdirectories in which to run `make all'. SUBDIRS = libcruft liboctave @DLD_DIR@ info readline kpathsea src \