Mercurial > hg > octave-lojdl
changeset 2624:7e24c1f29db4
[project @ 1997-01-26 04:40:00 by jwe]
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 25 22:27:14 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): New target. + + * install-octave: Rename from doinstall.sh. Update for 2.x. + Wed Jan 22 11:14:07 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * aclocal.m4 (ld_run_path): Anchor search at beginning of line to
--- a/Makefile.in +++ b/Makefile.in @@ -37,8 +37,8 @@ src scripts doc check octave.info INSTALL.OCTAVE BUGS \ install uninstall tags TAGS 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 conf-dist snapshot-z snapshot \ - snapshot-version + clean-bin-dist-tar binary-dist bin-dist conf-dist \ + snapshot-z snapshot snapshot-version NO_DEP_TARGETS = clean mostlyclean distclean maintainer-clean
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 25 22:32:33 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in, interpreter/Makefile.in, liboctave/Makefile.in, + faq/Makefile.in, refcard/Makefile.in (bin-dist): New target. + Tue Jan 7 00:17:24 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Version 2.0.1 released.
--- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -26,6 +26,8 @@ DISTSUBDIRS = $(SUBDIRS) +BINDISTSUBDIRS = $(SUBDIRS) + all: $(SUBDIRS) .PHONY: all @@ -63,3 +65,7 @@ ln $(DISTFILES) ../`cat ../.fname`/doc for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; cd $$dir; $(MAKE) $@; cd ..; done .PHONY: dist + +bin-dist: + for dir in $(BINDISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; cd $$dir; $(MAKE) $@; cd ..; done +.PHONY: bin-dist
--- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -26,6 +26,8 @@ DISTFILES := Makefile.in $(TEXINFO) $(FORMATTED) +BINDISTFILES = + SPELL := $(patsubst %.texi, %.spell, $(ALL_TEXINFO)) %.spell : %.texi @@ -70,3 +72,9 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/faq ; \ + fi +.PHONY: bin-dist
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -31,11 +31,23 @@ stats.texi stmt.texi strings.texi system.texi var.texi \ vr-idx.texi -FORMATTED = octave.dvi octave.ps octave.info octave.info-[0-9]* +FORMATTED = octave.dvi octave.ps octave.info octave.info octave.info-[0-9]* DISTFILES = Makefile.in dir octave.1 conf.texi gpl.texi \ $(TEXINFO) $(FORMATTED) +ifeq ($(wildcard octave.info), ) + BINDISTFILES = $(srcdir)/octave.1 $(srcdir)/octave.info \ + $(wildcard $(srcdir)/octave.info-[0-9]*) +else + BINDISTFILES = $(srcdir)/octave.1 octave.info octave.info-[0-9]* +endif + +# Look for version.h to get version information. +xfiles := $(TOPDIR)/src/version.h $(srcdir)/$(TOPDIR)/src/version.h + +version_file := $(firstword $(foreach file, $(xfiles), $(wildcard $(file)))) + SPELL = $(patsubst %.texi, %.spell, $(ALL_TEXINFO)) %.spell : %.texi @@ -162,3 +174,9 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/interpreter ; \ + fi +.PHONY: bin-dist
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -29,6 +29,8 @@ DISTFILES = Makefile.in conf.texi gpl.texi $(TEXINFO) $(FORMATTED) +BINDISTFILES = + SPELL = $(patsubst %.texi, %.spell, $(TEXINFO)) %.spell : %.texi @@ -108,3 +110,9 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/liboctave ; \ + fi +.PHONY: bin-dist
--- a/doc/refcard/Makefile.in +++ b/doc/refcard/Makefile.in @@ -26,6 +26,8 @@ DISTFILES := Makefile.in $(TEX) $(FORMATTED) +BINDISTFILES = $(addprefix $(srcdir)/, $(TEX) $(FORMATTED)) + all: $(FORMATTED) refcard-a4.dvi: refcard-a4.tex refcard.tex @@ -69,3 +71,9 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/refcard .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/refcard ; \ + fi +.PHONY: bin-dist
--- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -18,9 +18,13 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -SOURCES = hello.cc make_int.cc info-emacs-info info-emacs-octave-help +SCRIPTS = info-emacs-info info-emacs-octave-help + +SOURCES = hello.cc make_int.cc -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) + +BINDISTFILES = $(addprefix $(srcdir)/, $(SCRIPTS)) SUBDIRS = @@ -52,3 +56,9 @@ dist: ln $(DISTFILES) ../`cat ../.fname`/examples .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/examples ; \ + fi +.PHONY: bin-dist
--- a/info/ChangeLog +++ b/info/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 25 22:33:43 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): New target. + Sat Jan 18 15:57:49 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (MAKEDOC_OBJECTS): Also include $(LIBOBJS).
--- a/info/Makefile.in +++ b/info/Makefile.in @@ -1,5 +1,5 @@ # Makefile for texinfo/info. -*- Indented-Text -*- -# $Id: Makefile.in,v 1.37 1997-01-20 17:25:41 jwe Exp $ +# $Id: Makefile.in,v 1.38 1997-01-26 04:40:02 jwe Exp $ # # Copyright (C) 1993,96 Free Software Foundation, Inc. @@ -107,6 +107,8 @@ DISTFILES = Makefile.in ChangeLog README NEWS info.1 configure.in \ configure mkinstalldirs $(SRCS) $(HDRS) $(infofiles) $(TEXINFO) $(DVI) +BINDISTFILES = info + %.o : %.c $(CC) -c $(CPPFLAGS) $(LDEFS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $< @@ -160,6 +162,12 @@ ln $(DISTFILES) ../`cat ../.fname`/info .PHONY: dist +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/info ; \ + fi +.PHONY: bin-dist + TAGS: $(SRCS) makedoc-TAGS etags $(SRCS) cat makedoc-TAGS >>TAGS && $(RM) makedoc-TAGS
--- a/kpathsea/ChangeLog +++ b/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 25 22:33:56 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): New target. + Thu Dec 5 18:59:44 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * config.sub: Update to current version from FSF.
--- a/kpathsea/Makefile.in +++ b/kpathsea/Makefile.in @@ -37,6 +37,11 @@ SH_LIBS_TO_INSTALL = libkpathsea.$(SHLEXT) +ifeq ($(SHARED_LIBS), true) + BINDISTFILES = libkpathsea.$(SHLEXT) + BINDISTLIBS = $(addprefix kpathsea/, libkpathsea.$(SHLEXT)) +endif + default all: stamp-picdir kpsewhich MakeTeXPK kpathsea.info stamp-shared stamp-picdir: @@ -197,6 +202,13 @@ cd $(distdir); rm -f paths.h cd $(distdir); add-version $(version) version.c +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/kpathsea ; \ + fi + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES +.PHONY: bin-dist + ac_include ../make/config.make info: kpathsea.info
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,13 @@ +Sat Jan 25 22:34:10 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in, balgen/Makefile.in, blas/Makefile.in, + cfsqp/Makefile.in, dassl/Makefile.in, eispack/Makefile.in, + fftpack/Makefile.in, fsqp/Makefile.in, lapack/Makefile.in, + linpack/Makefile.in, minpack/Makefile.in, misc/Makefile.in, + npsol/Makefile.in, odepack/Makefile.in, qpsol/Makefile.in, + quadpack/Makefile.in, ranlib/Makefile.in, slatec-fn/Makefile.in, + villad/Makefile.in (bin-dist): New target. + Wed Jan 22 15:03:33 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * misc/Makefile.in (pic/machar.o): Add $(CPICFLAG) for this target.
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -32,6 +32,11 @@ DISTFILES = Makefile.in ChangeLog Makerules.in $(SOURCES) STOP.patch +ifeq ($(SHARED_LIBS), true) + BINDISTFILES = libcruft.$(SHLEXT) + BINDISTLIBS = $(addprefix libcruft/, libcruft.$(SHLEXT)) +endif + all: $(SUBDIRS) stamp-shared .PHONY: all @@ -117,3 +122,10 @@ for dir in $(SUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; cd $$dir; $(MAKE) $@; cd ..; done ln $(DISTFILES) ../`cat ../.fname`/libcruft .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/libcruft ; \ + fi + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES +.PHONY: bin-dist
--- a/libcruft/misc/Makefile.in +++ b/libcruft/misc/Makefile.in @@ -54,4 +54,4 @@ $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< pic/machar.o: $(srcdir)/machar.c - $(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@ + $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 25 22:36:21 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): New target. + Wed Jan 22 16:18:53 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * dbleSVD.cc (SVD::init): Work around apparent dgesvd() bug.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -77,6 +77,11 @@ DISTFILES := Makefile.in ChangeLog safe-xstat.cin safe-xstat.hin \ $(SOURCES) $(INCLUDES) $(EXTRAS) +ifeq ($(SHARED_LIBS), true) + BINDISTFILES = liboctave.$(SHLEXT) + BINDISTLIBS = $(addprefix liboctave/, liboctave.$(SHLEXT)) +endif + MAKEDEPS_1 := $(patsubst %.cc, %.d, $(SOURCES)) MAKEDEPS := $(patsubst %.c, %.d, $(MAKEDEPS_1)) @@ -100,7 +105,7 @@ touch stamp-prereq stamp-picdir: - if [ "$(SHARED_LIBS)" = true ]; then \ + if $(SHARED_LIBS); then \ if [ -n "$(CPICFLAG)" ] || [ -n "$(CXXPICFLAG)" ]; then \ if [ -d pic ]; then \ true ; \ @@ -222,6 +227,13 @@ ln $(DISTFILES) ../`cat ../.fname`/liboctave .PHONY: dist +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/liboctave ; \ + fi + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES +.PHONY: bin-dist + # If missing, GNU make attempts to create them in the reverse of the # order in which they are listed here. We rely on that fact to ensure # that the safe-stat.h and safe-lstat.h files are created before trying
--- a/octMakefile.in +++ b/octMakefile.in @@ -25,8 +25,8 @@ DISTFILES = $(CONF_DISTFILES) \ BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] PROJECTS \ README README.Linux README.NLP README.Windows ROADMAP \ - SENDING-PATCHES THANKS move-if-change octave.sh octave-bug.in \ - doinstall.sh mkinstalldirs mkoctfile.in texi2dvi INFO.PATCH \ + SENDING-PATCHES THANKS move-if-change octave-sh octave-bug.in \ + install-octave mkinstalldirs mkoctfile.in texi2dvi INFO.PATCH \ MAKEINFO.PATCH ChangeLog ChangeLog.[0-9] # Complete directory trees to distribute. @@ -43,12 +43,20 @@ DISTSUBDIRS = libcruft liboctave info readline dlfcn src scripts \ test doc examples -BINDISTFILES = COPYING ChangeLog NEWS README THANKS INSTALL.OCTAVE \ - BUGS PROJECTS octave-bug octave.sh doinstall.sh \ - mkinstalldirs +XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \ + PROJECTS README README.Linux README.NLP README.Windows \ + SENDING-PATCHES THANKS octave-sh insatll-octave mkinstalldirs \ + ChangeLog ChangeLog.[0-9] -# Subdirectories in which to run `make dist'. -BINDISTSUBDIRS = emacs scripts doc +BINDISTFILES = $(addprefix $(srcdir)/, $(XBINDISTFILES)) \ + octave-bug VERSION ARCH + +# Subdirectories in which to run `make bin-dist'. +BINDISTSUBDIRS = libcruft liboctave src info kpathsea readline \ + scripts doc examples + +# Complete directories trees to distribute with binary distributions. +BINDISTDIRS = emacs # Subdirectories in which to run clean targets. CLEANSUBDIRS = $(DISTSUBDIRS) glob kpathsea @@ -123,37 +131,9 @@ rm -f config.h config.log config.status Makerules.f77 rm -f mk-oct-links mkoctfile -# Now that things are under RCS control, we need to do the recursive -# chmod so that the distributed files end up with reasonable modes. - -# Shared rules for making clean tar files. - -clean-tar: - echo octave-$(version) > .fname - tar xf `cat .fname`.tar - find `cat .fname` \( \( -name RCS -a -type d \) \ - -o \( -name OLD -a -type d \) -o -name "=*" \ - -o -name '*~' -o -name '#*#' -o -name config.log \ - -o -name config.status -o -name Makefile \ - -o -name c-auto.h \) -print | xargs rm -rf - rm -f `cat .fname`/test/octave.test/*.m - rm -rf `cat .fname`/test/octave.test/npsol - rm -rf `cat .fname`/test/octave.test/qpsol - chmod -R a+rwX `cat .fname` - tar cf `cat .fname`.tar `cat .fname` - rm -rf `cat .fname` .fname -.PHONY: clean-tar - -dist-z: - echo octave-$(version) > .fname - rm -f `cat .fname`.tar.gz - gzip --best `cat .fname`.tar - rm -f .fname -.PHONY: dist-z - # Rules for making a source distribution. -dist-info-files: octave.info INSTALL.OCTAVE BUGS kpathsea.info +dist-info-files: INSTALL.OCTAVE BUGS .PHONY: dist-info-files links-for-dist: dist-info-files @@ -170,50 +150,62 @@ rm -rf `cat .fname` .PHONY: dist-tar -clean-dist-tar: dist-tar - $(MAKE) clean-tar -.PHONY: clean-dist-tar - -dist: clean-dist-tar +dist: dist-tar + echo octave-$(version) > .fname + tar xf `cat .fname`.tar + find `cat .fname` \( \( -name RCS -a -type d \) \ + -o \( -name OLD -a -type d \) -o -name "=*" \ + -o -name '*~' -o -name '#*#' -o -name config.log \ + -o -name config.status -o -name Makefile \ + -o -name c-auto.h \) -print | xargs rm -rf + rm -f `cat .fname`/test/octave.test/*.m + rm -rf `cat .fname`/test/octave.test/npsol + rm -rf `cat .fname`/test/octave.test/qpsol + chmod -R a+rwX `cat .fname` + tar cf `cat .fname`.tar `cat .fname` + rm -rf `cat .fname` .fname .PHONY: dist # Rules for making a binary distribution. -links-for-bin-dist: dist-info-files - echo octave-$(version) > .fname +VERSION: + echo $(version) > VERSION +.PHONY: VERSION + +ARCH: + echo $(target_host_type) > ARCH +.PHONY: ARCH + +links-for-bin-dist: VERSION ARCH octave-bug dist-info-files + echo octave-$(version)-$(target_host_type) > .fname rm -rf `cat .fname` mkdir `cat .fname` ln $(BINDISTFILES) `cat .fname` - for dir in $(BINDISTSUBDIRS); do mkdir `cat .fname`/$$dir; cd $$dir; $(MAKE) dist; cd ..; done -.PHONY: links-for-dist +# for dir in $(BINDISTDIRS); do ln -s ../$$dir `cat .fname`; done + for dir in $(BINDISTSUBDIRS); do mkdir `cat .fname`/$$dir; cd $$dir; $(MAKE) bin-dist; cd ..; done +.PHONY: links-for-bin-dist bin-dist-tar: links-for-bin-dist - -strip src/octave - echo octave-$(version) > .fname - ln src/octave `cat .fname`/octave + echo octave-$(version)-$(target_host_type) > .fname tar chf `cat .fname`.tar `cat .fname` rm -rf `cat .fname` .PHONY: bin-dist-tar -clean-bin-dist-tar: bin-dist-tar - $(MAKE) clean-tar -.PHONY: clean-bin-dist-tar - -# binary-dist: clean-bin-dist-tar -binary-dist: - @echo "" - @echo "**********************************************************" - @echo "* *" - @echo "* The binary-dist target doesn't work for this version *" - @echo "* of Octave. *" - @echo "* *" - @echo "* If you are interested in making a binary distribution *" - @echo "* of this version of Octave, please contact *" - @echo "* bug-octave@bevo.che.wisc.edu. *" - @echo "* *" - @echo "**********************************************************" - @echo "" -.PHONY: binary-dist +binary-dist bin-dist: bin-dist-tar + echo octave-$(version)-$(target_host_type) > .fname + tar xf `cat .fname`.tar + find `cat .fname` \( \( -name RCS -a -type d \) \ + -o \( -name OLD -a -type d \) -o -name "=*" \ + -o -name '*~' -o -name '#*#' -o -name config.log \ + -o -name config.status -o -name Makefile \ + -o -name c-auto.h \) -print | xargs rm -rf + rm -f `cat .fname`/test/octave.test/*.m + rm -rf `cat .fname`/test/octave.test/npsol + rm -rf `cat .fname`/test/octave.test/qpsol + chmod -R a+rwX `cat .fname` + tar cf `cat .fname`.tar `cat .fname` + rm -rf `cat .fname` .fname +.PHONY: binary-dist bin-dist # Rules for making a dist of just the stuff needed to run configure.
--- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 25 22:36:28 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): New target. + Sat Jan 18 15:56:49 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-readline): Put CC command on a single line.
--- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -112,6 +112,11 @@ DISTFILES = $(CSOURCES) $(HSOURCES) Makefile.in configure.in \ configure README STANDALONE COPYING config.h.in +ifeq ($(SHARED_LIBS), true) + BINDISTFILES = $(SH_LIBS_TO_INSTALL) + BINDISTLIBS = $(addprefix readline/, $(SH_LIBS_TO_INSTALL)) +endif + SUBDIRS = doc examples # The texinfo files which document this library. @@ -223,6 +228,14 @@ ln $(DISTFILES) ../`cat ../.fname`/readline .PHONY: dist + +bin-dist: + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/readline ; \ + fi + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES +.PHONY: bin-dist + # Dependencies readline.o: readline.c readline.h rldefs.h rlconf.h chardefs.h readline.o: keymaps.h history.h
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,14 @@ +Sat Jan 25 22:37:07 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in, audio/Makefile.in, control/Makefile.in, + elfun/Makefile.in, general/Makefile.in, image/Makefile.in, + io/Makefile.in, linear-algebra/Makefile.in, + miscellaneous/Makefile.in, plot/Makefile.in, + polynomial/Makefile.in, set/Makefile.in, signal/Makefile.in, + specfun/Makefile.in, special-matrix/Makefile.in, + startup/Makefile.in, statistics/Makefile.in, strings/Makefile.in, + time/Makefile.in (bin-dist): New target. + Wed Jan 22 11:28:30 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * specfun/erfinv.m: Avoid A([]) = X, X != [] error.
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -31,6 +31,8 @@ DISTSUBDIRS = $(SUBDIRS) +BINDISTSUBDIRS = $(SUBDIRS) + FCN_FILES = # $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = # $(notdir $(FCN_FILES)) @@ -68,6 +70,10 @@ rm -f tags TAGS Makefile config.log config.status dist: - ln $(DISTFILES) ../`cat ../.fname`/scripts + $(LN_S) $(DISTFILES) ../`cat ../.fname`/scripts for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; cd $$dir; $(MAKE) $@; cd ..; done .PHONY: dist + +bin-dist: + for dir in $(BINDISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; cd $$dir; $(MAKE) $@; cd ..; done +.PHONY: bin-dist
--- a/scripts/audio/Makefile.in +++ b/scripts/audio/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/audio .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/audio +.PHONY: bin-dist
--- a/scripts/control/Makefile.in +++ b/scripts/control/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/control .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/control +.PHONY: bin-dist
--- a/scripts/elfun/Makefile.in +++ b/scripts/elfun/Makefile.in @@ -1,4 +1,4 @@ -# + # Makefile for octave's scripts/elfun directory # # John W. Eaton @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/elfun .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/elfun +.PHONY: bin-dist
--- a/scripts/general/Makefile.in +++ b/scripts/general/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/general .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/general +.PHONY: bin-dist
--- a/scripts/image/Makefile.in +++ b/scripts/image/Makefile.in @@ -31,6 +31,8 @@ IMAGE_FILES = $(wildcard $(srcdir)/*.img) IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES)) +BINDISTFILES = $(FCN_FILES) $(IMAGE_FILES) + all: .PHONY: all @@ -80,3 +82,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/image .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/image +.PHONY: bin-dist
--- a/scripts/io/Makefile.in +++ b/scripts/io/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/io .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/io +.PHONY: bin-dist
--- a/scripts/linear-algebra/Makefile.in +++ b/scripts/linear-algebra/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/linear-algebra .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/linear-algebra +.PHONY: bin-dist
--- a/scripts/miscellaneous/Makefile.in +++ b/scripts/miscellaneous/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/miscellaneous .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/miscellaneous +.PHONY: bin-dist
--- a/scripts/plot/Makefile.in +++ b/scripts/plot/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/plot .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/plot +.PHONY: bin-dist
--- a/scripts/polynomial/Makefile.in +++ b/scripts/polynomial/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/polynomial .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/polynomial +.PHONY: bin-dist
--- a/scripts/set/Makefile.in +++ b/scripts/set/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/set .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/set +.PHONY: bin-dist
--- a/scripts/signal/Makefile.in +++ b/scripts/signal/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/signal .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/signal +.PHONY: bin-dist
--- a/scripts/specfun/Makefile.in +++ b/scripts/specfun/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/specfun .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/specfun +.PHONY: bin-dist
--- a/scripts/special-matrix/Makefile.in +++ b/scripts/special-matrix/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/special-matrix .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/special-matrix +.PHONY: bin-dist
--- a/scripts/startup/Makefile.in +++ b/scripts/startup/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = # $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = # $(notdir $(FCN_FILES)) +BINDISTFILES = $(srcdir)/octaverc + all: .PHONY: all @@ -79,3 +81,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/startup .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/startup +.PHONY: bin-dist
--- a/scripts/statistics/Makefile.in +++ b/scripts/statistics/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/statistics .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/statistics +.PHONY: bin-dist
--- a/scripts/strings/Makefile.in +++ b/scripts/strings/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/strings .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/strings +.PHONY: bin-dist
--- a/scripts/time/Makefile.in +++ b/scripts/time/Makefile.in @@ -27,6 +27,8 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) +BINDISTFILES = $(FCN_FILES) + all: .PHONY: all @@ -67,3 +69,7 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/time .PHONY: dist + +bin-dist: + ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/time +.PHONY: bin-dist
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 25 22:36:39 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): Update for 2.x. + Fri Jan 24 10:05:00 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * mk-oct-links.in: New arg, -p, to just print list of files to link.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -170,8 +170,14 @@ octave.cc parse.cc lex.cc y.tab.h \ $(INCLUDES) $(DLD_SRC) $(SOURCES) $(TI_SRC) -all: stamp-prereq stamp-picdir libraries \ - $(OCT_FILES) octave +ifeq ($(SHARED_LIBS), true) + BINDISTFILES = octave $(OCT_FILES) $(SH_LIBS_TO_INSTALL) + BINDISTLIBS = $(addprefix src/, $(SH_LIBS_TO_INSTALL)) +else + BINDISTFILES = octave $(OCT_FILES) +endif + +all: stamp-prereq stamp-picdir libraries $(OCT_FILES) octave .PHONY: all stamp-prereq: defaults.h oct-conf.h @@ -249,6 +255,7 @@ sed < $< > $@.tmp \ -e "s;%LN_S%;${LN_S};" $(top_srcdir)/move-if-change $@.tmp $@ + chmod a+rx mk-oct-links install-bin: $(top_srcdir)/mkinstalldirs $(bindir) @@ -260,7 +267,6 @@ install-oct: mk-oct-links if [ -n "$(OCT_FILES)" ]; then \ $(top_srcdir)/mkinstalldirs $(octfiledir) ; \ - chmod a+rx mk-oct-links ; \ xfiles="$(OCT_FILES)" ; \ for f in $$xfiles ; do \ $(INSTALL_PROGRAM) $$f $(octfiledir)/$$f; \ @@ -343,6 +349,18 @@ ln octave.cc Makefile.in ../`cat ../.fname`/src .PHONY: conf-dist +bin-dist: mk-oct-links + if [ -n "$(BINDISTFILES)" ]; then \ + ln $(BINDISTFILES) ../`cat ../.fname`/src ; \ + fi + if [ -n "$(OCT_FILES)" ]; then \ + ./mk-oct-links -p $(octfiledir) \ + $(addprefix $(srcdir)/, $(DLD_SRC)) \ + > ../`cat ../.fname`/src/links-to-make ; \ + fi + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES +.PHONY: bin-dist + # Special rules -- these files need special things to be defined. parse.cc : parse.y