Mercurial > octave-nkf
changeset 20363:fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
* scripts/module.mk: New file created from scripts/Makefile.am
* scripts/Makefile.am: Delete.
* Makefile.am (SUBDIRS): Remove scripts from the list.
* configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile from the list.
* doc/interpreter/images.awk, doc/module.mk, etc/module.mk,
scripts/@ftp/module.mk, scripts/audio/module.mk,
scripts/deprecated/module.mk, scripts/elfun/module.mk,
scripts/general/module.mk, scripts/geometry/module.mk,
scripts/gui/module.mk, scripts/help/module.mk,
scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk,
scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk,
scripts/optimization/module.mk, scripts/path/module.mk,
scripts/pkg/module.mk, scripts/plot/appearance/module.mk,
scripts/plot/draw/module.mk, scripts/plot/util/module.mk,
scripts/polynomial/module.mk, scripts/prefs/module.mk,
scripts/set/module.mk, scripts/signal/module.mk,
scripts/sparse/module.mk, scripts/specfun/module.mk,
scripts/special-matrix/module.mk, scripts/startup/module.mk,
scripts/statistics/base/module.mk,
scripts/statistics/distributions/module.mk,
scripts/statistics/models/module.mk,
scripts/statistics/tests/module.mk, scripts/strings/module.mk,
scripts/testfun/module.mk, scripts/time/module.mk: Update for
non-recursive build.
line wrap: on
line diff
--- a/Makefile.am Fri Jul 10 13:28:33 2015 -0400 +++ b/Makefile.am Fri Jul 10 14:40:47 2015 -0400 @@ -20,6 +20,7 @@ include build-aux/common.mk +image_DATA = octdata_DATA = octetc_DATA = octlocale_DATA = @@ -65,11 +66,19 @@ BUILT_SOURCES = TEST_FILES = -IMAGES_SRC = -IMAGES_EPS = -IMAGES_PDF = -IMAGES_PNG = -IMAGES_TXT = +DOC_IMAGES = +DOC_IMAGES_SRC = +DOC_IMAGES_EPS = +DOC_IMAGES_PDF = +DOC_IMAGES_PNG = +DOC_IMAGES_TXT = + +FCN_FILE_DIRS = +FCN_FILES = +GEN_FCN_FILES = +PKG_ADD_FILES = +SCRIPTS_IMAGES = +JAR_FILES = bin_PROGRAMS = archlib_PROGRAMS = @@ -95,6 +104,7 @@ include libgui/module.mk include libgui/link-deps.mk include src/module.mk +include scripts/module.mk include doc/module.mk include doc/interpreter/images.mk include etc/module.mk @@ -106,9 +116,9 @@ # directories are handled directly from this Makefile (see also the # included makefile fragments). -SUBDIRS = libgnu scripts +SUBDIRS = libgnu -dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook +dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook if AMCOND_BUILD_DOCS docs-dist-hook: @@ -218,3 +228,5 @@ $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) install-data-local: installdirs-local + +distclean-local: scripts-distclean
--- a/configure.ac Fri Jul 10 13:28:33 2015 -0400 +++ b/configure.ac Fri Jul 10 14:40:47 2015 -0400 @@ -2998,8 +2998,7 @@ Makefile doc/doxyhtml/Doxyfile libgnu/Makefile - liboctave/cruft/mkf77def - scripts/Makefile]) + liboctave/cruft/mkf77def]) AC_OUTPUT
--- a/doc/interpreter/images.awk Fri Jul 10 13:28:33 2015 -0400 +++ b/doc/interpreter/images.awk Fri Jul 10 14:40:47 2015 -0400 @@ -15,7 +15,7 @@ basename = script; sub (/\.m$/, "", basename); ubasename = toupper (basename); - printf ("IMAGES_SRC += %s%s\n", dir, script); + printf ("DOC_IMAGES_SRC += %s%s\n", dir, script); for (i = 1; i <= 4; i++) { ext = exts[i]; uext = toupper (ext); @@ -25,7 +25,7 @@ printf (" %s%s.%s", dir, $j, ext); printf ("\n"); - printf ("IMAGES_%s += $(%s_%s)\n", uext, ubasename, uext); + printf ("DOC_IMAGES_%s += $(%s_%s)\n", uext, ubasename, uext); for (j = 2; j <= NF; j++) { printf ("%s%s.%s: %s%s\n", dir, $j, ext, dir, script);
--- a/doc/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/doc/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,9 +1,10 @@ TEXINFO_TEX = doc/texinfo.tex TEXINPUTS := $(PATH_SEPARATOR)$(top_srcdir)/doc/interpreter$(PATH_SEPARATOR)$(PATH_SEPARATOR)$(top_builddir)/doc/interpreter$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR) -export TEXINPUTS TEXMFCNF := $(PATH_SEPARATOR)$(top_srcdir)/doc$(PATH_SEPARATOR)$(top_builddir)/doc$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR) + +export TEXINPUTS export TEXMFCNF DVIPS = dvips @@ -94,7 +95,7 @@ doc/interpreter/octave-config.1 \ doc/interpreter/octave.1 -JAVA_IMAGES = \ +DOC_JAVA_IMAGES = \ doc/interpreter/java-images/image001.png \ doc/interpreter/java-images/image002.png \ doc/interpreter/java-images/image003.png \ @@ -105,30 +106,30 @@ doc/interpreter/java-images/image008.png \ doc/interpreter/java-images/image009.png -BUILT_IMAGES = \ - $(IMAGES_EPS) \ - $(IMAGES_PDF) \ - $(IMAGES_PNG) \ - $(IMAGES_TXT) +BUILT_DOC_IMAGES = \ + $(DOC_IMAGES_EPS) \ + $(DOC_IMAGES_PDF) \ + $(DOC_IMAGES_PNG) \ + $(DOC_IMAGES_TXT) -IMAGES = \ - $(BUILT_IMAGES) \ - $(JAVA_IMAGES) +DOC_IMAGES += \ + $(BUILT_DOC_IMAGES) \ + $(DOC_JAVA_IMAGES) -$(BUILT_IMAGES): $(OCTAVE_INTERPRETER_TARGETS) +$(BUILT_DOC_IMAGES): $(OCTAVE_INTERPRETER_TARGETS) -## FIXME: JAVA_IMAGES will eventually need to be added to the HTML build. +## FIXME: DOC_JAVA_IMAGES will eventually need to be added to the HTML build. ## It will require a different Makefile rule later because -## JAVA_IMAGES live in a subdir rather than in the current directory. +## DOC_JAVA_IMAGES live in a subdir rather than in the current directory. -HTMLDIR_IMAGES = $(patsubst doc/interpreter/%.png, doc/interpreter/octave.html/%.png, $(IMAGES_PNG)) +HTMLDIR_IMAGES = $(patsubst doc/interpreter/%.png, doc/interpreter/octave.html/%.png, $(DOC_IMAGES_PNG)) LOGOS = \ doc/interpreter/octave_logo.eps \ doc/interpreter/octave_logo.pdf -IMAGES_EPS += doc/interpreter/octave_logo.eps -IMAGES_PDF += doc/interpreter/octave_logo.pdf +DOC_IMAGES_EPS += doc/interpreter/octave_logo.eps +DOC_IMAGES_PDF += doc/interpreter/octave_logo.pdf MUNGED_TEXI_SRC = \ doc/interpreter/arith.texi \ @@ -211,10 +212,10 @@ OCTAVE_HTML_TMP_DIR = $(OCTAVE_HTML_DIR:.html=.htp) OCTAVE_HTML_STAMP = $(OCTAVE_HTML_DIR)/.html-stamp -$(srcdir)/doc/interpreter/octave.info: $(IMAGES_TXT) $(octave_TEXINFOS) -doc/interpreter/octave.dvi: $(IMAGES_EPS) $(octave_TEXINFOS) -doc/interpreter/octave.pdf: $(IMAGES_PDF) $(octave_TEXINFOS) -$(OCTAVE_HTML_STAMP): $(IMAGES_PNG) $(octave_TEXINFOS) +$(srcdir)/doc/interpreter/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS) +doc/interpreter/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS) +doc/interpreter/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS) +$(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS) $(srcdir)/doc/interpreter/octave.info: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ @@ -298,9 +299,6 @@ $(top_builddir)/run-octave -f -q -H $(srcdir)/doc/interpreter/mk_doc_cache.m - $(srcdir)/doc/interpreter/macros.texi $(DOCSTRING_FILES) >$@-t && \ mv $@-t $@ -scripts/.DOCSTRINGS: - $(MAKE) -C scripts .DOCSTRINGS - $(MUNGED_TEXI_SRC): $(DOCSTRING_DEPS) $(munge_texi_SOURCES) %.texi : %.txi doc/interpreter/munge-texi.pl doc/interpreter/$(octave_dirstamp) @@ -349,8 +347,8 @@ doc/interpreter/mk_doc_cache.m \ doc/interpreter/mkcontrib.awk \ doc/interpreter/munge-texi.pl \ - $(IMAGES) \ - $(IMAGES_SRC) \ + $(DOC_IMAGES) \ + $(DOC_IMAGES_SRC) \ $(LOGOS) \ $(TXI_SRC) @@ -362,7 +360,7 @@ $(OCTAVE_HTML_STAMP) MAINTAINERCLEANFILES += \ - $(BUILT_IMAGES) \ + $(BUILT_DOC_IMAGES) \ doc/interpreter/doc-cache DIRSTAMP_FILES += doc/interpreter/$(octave_dirstamp)
--- a/etc/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/etc/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -51,7 +51,7 @@ etc/icons/octave.appdata.xml.in \ etc/icons/octave.desktop.in -image_DATA = \ +image_DATA += \ $(icon_IMAGE_FILES) \ etc/icons/octave-logo.ico
--- a/scripts/@ftp/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/@ftp/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,24 +1,4 @@ -FCN_FILE_DIRS += @ftp - -@ftp_FCN_FILES = \ - @ftp/ascii.m \ - @ftp/binary.m \ - @ftp/cd.m \ - @ftp/close.m \ - @ftp/delete.m \ - @ftp/dir.m \ - @ftp/display.m \ - @ftp/ftp.m \ - @ftp/loadobj.m \ - @ftp/mget.m \ - @ftp/mkdir.m \ - @ftp/mput.m \ - @ftp/rename.m \ - @ftp/rmdir.m \ - @ftp/saveobj.m - -FCN_FILES += $(@ftp_FCN_FILES) - -PKG_ADD_FILES += @ftp/PKG_ADD - -DIRSTAMP_FILES += @ftp/$(octave_dirstamp) +## FIXME -- including scripts/@ftp/module.mk fails. +## Is that an automake bug? +## +## What should be in this file is in scripts/module.mk.
--- a/scripts/Makefile.am Fri Jul 10 13:28:33 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,235 +0,0 @@ -# Makefile for Octave's scripts directory -# -# Copyright (C) 1993-2015 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/>. - -include $(top_srcdir)/build-aux/common.mk - -EXTRA_DIST = - -CLEANFILES = - -DISTCLEANFILES = - -FCN_FILE_DIRS = - -FCN_FILES = - -GEN_FCN_FILES = - -PKG_ADD_FILES = - -DIRSTAMP_FILES = - -IMAGES = - -JAR_FILES = - -## Read subdirs to set all variables above -include @ftp/module.mk -include audio/module.mk -include deprecated/module.mk -include elfun/module.mk -include general/module.mk -include geometry/module.mk -include gui/module.mk -include help/module.mk -include image/module.mk -include io/module.mk -include java/module.mk -include linear-algebra/module.mk -include miscellaneous/module.mk -include optimization/module.mk -include path/module.mk -include pkg/module.mk -include plot/appearance/module.mk -include plot/draw/module.mk -include plot/util/module.mk -include polynomial/module.mk -include prefs/module.mk -include set/module.mk -include signal/module.mk -include sparse/module.mk -include specfun/module.mk -include special-matrix/module.mk -include startup/module.mk -include statistics/base/module.mk -include statistics/distributions/module.mk -include statistics/models/module.mk -include statistics/tests/module.mk -include strings/module.mk -include testfun/module.mk -include time/module.mk - -nobase_fcnfile_DATA = $(FCN_FILES) $(GEN_FCN_FILES) $(JAR_FILES) - -image_DATA = $(IMAGES) - -FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in) - -if AMCOND_BUILD_DOCS -all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) $(JAR_FILES) .DOCSTRINGS -else -all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) $(JAR_FILES) -endif - -octave_dirstamp = $(am__leading_dot)dirstamp - -$(DIRSTAMP_FILES): - $(AM_V_GEN)$(MKDIR_P) $(@D) && \ - : > $@ - -define PKG_ADD_FILE_TEMPLATE -$(1)/PKG_ADD: $$($(subst /,_,$(1))_FCN_FILES) $$($(subst /,_,$(1))_GEN_FCN_FILES) $(1)/$(octave_dirstamp) mk-pkg-add - $$(AM_V_GEN)rm -f $$@-t $$@ && \ - $$(srcdir)/mk-pkg-add $(srcdir) $$($$(@D)_FCN_FILES) -- $$($$(@D)_GEN_FCN_FILES) > $$@-t && \ - mv $$@-t $$@ -endef - -$(foreach d, $(FCN_FILE_DIRS), $(eval $(call PKG_ADD_FILE_TEMPLATE, $(d)))) - -define GEN_FCN_FILES_TEMPLATE -$(1): $(1:.m=.in) Makefile $(dir $(1))$(octave_dirstamp) - $$(AM_V_GEN)$$(do_subst_config_vals) -endef - -$(foreach f, $(GEN_FCN_FILES), $(eval $(call GEN_FCN_FILES_TEMPLATE, $(f)))) - -if AMCOND_BUILD_DOCS - -.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc.pl Makefile - $(AM_V_GEN)rm -f $@-t $@ && \ - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ - touch -r $(srcdir)/DOCSTRINGS DOCSTRINGS; \ - fi && \ - $(PERL) $(srcdir)/mkdoc.pl "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t && \ - mv $@-t $@ && \ - $(top_srcdir)/build-aux/move-if-change $@ DOCSTRINGS && \ - touch $@ - -endif - -check-m-sources: - @echo "checking whether files in source tree are listed in module.mk files..."; \ - for f in $$(find $(srcdir) -name '*.m'); do \ - found=false; \ - for m in $(FCN_FILES) $(GEN_FCN_FILES); do \ - if [ "$$f" = $(srcdir)/"$$m" ]; then \ - found=true; \ - break; \ - fi; \ - done; \ - if $$found; then \ - true; \ - else \ - missing=$$(echo $$f | $(SED) "s|^$(srcdir)||"); \ - echo "$$missing: not listed in SOURCES"; \ - fi; \ - done; \ - if test -z "$$missing"; then \ - echo "yes"; \ - fi -.PHONY: check-m-sources - -check-missing-semicolon: - @echo "checking for missing semicolons in .m files..." - ( echo "warning on Octave:missing-semicolon;"; \ - for m in $(addprefix $(srcdir)/, $(FCN_FILES)) $(GEN_FCN_FILES); do \ - echo "source ('$$m');"; \ - done ) | ../run-octave -qf -.PHONY: check-missing-semicolon - -## Add rule to generate ctags. -## Automake would normally generate such a rule, but only if there is a -## xxx_SOURCES target -ctags: - ctags $(addprefix $(srcdir)/, $(FCN_FILES)) $(GEN_FCN_FILES) - -install-data-local: install-startup-files install-pkg-add - -uninstall-local: uninstall-startup-files uninstall-pkg-add - -install-startup-files: - $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/startup - if test -f $(DESTDIR)$(fcnfiledir)/startup/octaverc; then true; \ - else \ - $(INSTALL_DATA) $(srcdir)/$(SYSTEM_STARTUP_FILE_SRC) \ - $(DESTDIR)$(fcnfiledir)/startup/octaverc; \ - fi - if test -f $(DESTDIR)$(fcnfiledir)/startup/inputrc; then true; \ - else \ - $(INSTALL_DATA) $(srcdir)/$(SYSTEM_INPUTRC_FILE_SRC) \ - $(DESTDIR)$(fcnfiledir)/startup/inputrc; \ - fi - $(MKDIR_P) $(DESTDIR)$(localfcnfiledir)/startup - if test -f $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ - then true; \ - else \ - $(INSTALL_DATA) $(srcdir)/$(LOCAL_STARTUP_FILE_SRC) \ - $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ - fi -.PHONY: install-startup-files - -uninstall-startup-files: - rm -f $(DESTDIR)$(fcnfiledir)/startup/octaverc - rm -f $(DESTDIR)$(fcnfiledir)/startup/inputrc - rm -f $(DESTDIR)$(localfcnfiledir)/startup/octaverc -.PHONY: uninstall-startup-files - -install-pkg-add: - for f in $(PKG_ADD_FILES); do \ - if [ -n "`cat $$f`" ]; then \ - $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/`echo $$f | $(SED) 's,/[^/]*$$,,'`; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$$f; \ - fi \ - done -.PHONY: install-pkg-add - -uninstall-pkg-add: - for f in $(PKG_ADD_FILES); do \ - rm -f $(DESTDIR)$(fcnfiledir)/$$f; \ - done -.PHONY: uninstall-pkg-add - -if AMCOND_HAVE_JAVA -else -dist-hook: - @echo "Packaging distribution requires Java." ; exit 1; -endif - -EXTRA_DIST += \ - $(IMAGES) \ - $(FCN_FILES) \ - $(FCN_FILES_IN) \ - $(GEN_FCN_FILES) \ - DOCSTRINGS \ - mkdoc.pl \ - mk-pkg-add - -DISTCLEANFILES += \ - .DOCSTRINGS \ - DOCSTRINGS \ - $(PKG_ADD_FILES) \ - $(DIRSTAMP_FILES) \ - $(GEN_FCN_FILES) - -distclean-local: - if [ "x$(srcdir)" != "x." ]; then \ - rm -f $(java_JAVA_IMAGES); \ - fi
--- a/scripts/audio/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/audio/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,45 +1,45 @@ -FCN_FILE_DIRS += audio +FCN_FILE_DIRS += scripts/audio -audio_FCN_FILES = \ - audio/lin2mu.m \ - audio/mu2lin.m \ - audio/record.m \ - audio/sound.m \ - audio/soundsc.m \ - audio/wavread.m \ - audio/wavwrite.m \ - audio/@audioplayer/__get_properties__.m \ - audio/@audioplayer/audioplayer.m \ - audio/@audioplayer/display.m \ - audio/@audioplayer/get.m \ - audio/@audioplayer/isplaying.m \ - audio/@audioplayer/pause.m \ - audio/@audioplayer/play.m \ - audio/@audioplayer/playblocking.m \ - audio/@audioplayer/resume.m \ - audio/@audioplayer/set.m \ - audio/@audioplayer/stop.m \ - audio/@audioplayer/subsasgn.m \ - audio/@audioplayer/subsref.m \ - audio/@audiorecorder/__get_properties__.m \ - audio/@audiorecorder/audiorecorder.m \ - audio/@audiorecorder/display.m \ - audio/@audiorecorder/get.m \ - audio/@audiorecorder/getaudiodata.m \ - audio/@audiorecorder/getplayer.m \ - audio/@audiorecorder/isrecording.m \ - audio/@audiorecorder/pause.m \ - audio/@audiorecorder/play.m \ - audio/@audiorecorder/record.m \ - audio/@audiorecorder/recordblocking.m \ - audio/@audiorecorder/resume.m \ - audio/@audiorecorder/set.m \ - audio/@audiorecorder/stop.m \ - audio/@audiorecorder/subsasgn.m \ - audio/@audiorecorder/subsref.m +scripts_audio_FCN_FILES = \ + scripts/audio/lin2mu.m \ + scripts/audio/mu2lin.m \ + scripts/audio/record.m \ + scripts/audio/sound.m \ + scripts/audio/soundsc.m \ + scripts/audio/wavread.m \ + scripts/audio/wavwrite.m \ + scripts/audio/@audioplayer/__get_properties__.m \ + scripts/audio/@audioplayer/audioplayer.m \ + scripts/audio/@audioplayer/display.m \ + scripts/audio/@audioplayer/get.m \ + scripts/audio/@audioplayer/isplaying.m \ + scripts/audio/@audioplayer/pause.m \ + scripts/audio/@audioplayer/play.m \ + scripts/audio/@audioplayer/playblocking.m \ + scripts/audio/@audioplayer/resume.m \ + scripts/audio/@audioplayer/set.m \ + scripts/audio/@audioplayer/stop.m \ + scripts/audio/@audioplayer/subsasgn.m \ + scripts/audio/@audioplayer/subsref.m \ + scripts/audio/@audiorecorder/__get_properties__.m \ + scripts/audio/@audiorecorder/audiorecorder.m \ + scripts/audio/@audiorecorder/display.m \ + scripts/audio/@audiorecorder/get.m \ + scripts/audio/@audiorecorder/getaudiodata.m \ + scripts/audio/@audiorecorder/getplayer.m \ + scripts/audio/@audiorecorder/isrecording.m \ + scripts/audio/@audiorecorder/pause.m \ + scripts/audio/@audiorecorder/play.m \ + scripts/audio/@audiorecorder/record.m \ + scripts/audio/@audiorecorder/recordblocking.m \ + scripts/audio/@audiorecorder/resume.m \ + scripts/audio/@audiorecorder/set.m \ + scripts/audio/@audiorecorder/stop.m \ + scripts/audio/@audiorecorder/subsasgn.m \ + scripts/audio/@audiorecorder/subsref.m -FCN_FILES += $(audio_FCN_FILES) +FCN_FILES += $(scripts_audio_FCN_FILES) -PKG_ADD_FILES += audio/PKG_ADD +PKG_ADD_FILES += scripts/audio/PKG_ADD -DIRSTAMP_FILES += audio/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/audio/$(octave_dirstamp)
--- a/scripts/deprecated/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/deprecated/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,28 +1,28 @@ -FCN_FILE_DIRS += deprecated +FCN_FILE_DIRS += scripts/deprecated -deprecated_FCN_FILES = \ - deprecated/bicubic.m \ - deprecated/delaunay3.m \ - deprecated/dump_prefs.m \ - deprecated/find_dir_in_path.m \ - deprecated/finite.m \ - deprecated/fmod.m \ - deprecated/fnmatch.m \ - deprecated/gmap40.m \ - deprecated/isstr.m \ - deprecated/loadaudio.m \ - deprecated/luinc.m \ - deprecated/mouse_wheel_zoom.m \ - deprecated/nfields.m \ - deprecated/octave_tmp_file_name.m \ - deprecated/playaudio.m \ - deprecated/saveaudio.m \ - deprecated/setaudio.m \ - deprecated/syl.m \ - deprecated/usage.m +scripts_deprecated_FCN_FILES = \ + scripts/deprecated/bicubic.m \ + scripts/deprecated/delaunay3.m \ + scripts/deprecated/dump_prefs.m \ + scripts/deprecated/find_dir_in_path.m \ + scripts/deprecated/finite.m \ + scripts/deprecated/fmod.m \ + scripts/deprecated/fnmatch.m \ + scripts/deprecated/gmap40.m \ + scripts/deprecated/isstr.m \ + scripts/deprecated/loadaudio.m \ + scripts/deprecated/luinc.m \ + scripts/deprecated/mouse_wheel_zoom.m \ + scripts/deprecated/nfields.m \ + scripts/deprecated/octave_tmp_file_name.m \ + scripts/deprecated/playaudio.m \ + scripts/deprecated/saveaudio.m \ + scripts/deprecated/setaudio.m \ + scripts/deprecated/syl.m \ + scripts/deprecated/usage.m -FCN_FILES += $(deprecated_FCN_FILES) +FCN_FILES += $(scripts_deprecated_FCN_FILES) -PKG_ADD_FILES += deprecated/PKG_ADD +PKG_ADD_FILES += scripts/deprecated/PKG_ADD -DIRSTAMP_FILES += deprecated/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/deprecated/$(octave_dirstamp)
--- a/scripts/elfun/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/elfun/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,34 +1,34 @@ -FCN_FILE_DIRS += elfun +FCN_FILE_DIRS += scripts/elfun -elfun_FCN_FILES = \ - elfun/acosd.m \ - elfun/acot.m \ - elfun/acotd.m \ - elfun/acoth.m \ - elfun/acsc.m \ - elfun/acscd.m \ - elfun/acsch.m \ - elfun/asec.m \ - elfun/asecd.m \ - elfun/asech.m \ - elfun/asind.m \ - elfun/atan2d.m \ - elfun/atand.m \ - elfun/cosd.m \ - elfun/cot.m \ - elfun/cotd.m \ - elfun/coth.m \ - elfun/csc.m \ - elfun/cscd.m \ - elfun/csch.m \ - elfun/sec.m \ - elfun/secd.m \ - elfun/sech.m \ - elfun/sind.m \ - elfun/tand.m +scripts_elfun_FCN_FILES = \ + scripts/elfun/acosd.m \ + scripts/elfun/acot.m \ + scripts/elfun/acotd.m \ + scripts/elfun/acoth.m \ + scripts/elfun/acsc.m \ + scripts/elfun/acscd.m \ + scripts/elfun/acsch.m \ + scripts/elfun/asec.m \ + scripts/elfun/asecd.m \ + scripts/elfun/asech.m \ + scripts/elfun/asind.m \ + scripts/elfun/atan2d.m \ + scripts/elfun/atand.m \ + scripts/elfun/cosd.m \ + scripts/elfun/cot.m \ + scripts/elfun/cotd.m \ + scripts/elfun/coth.m \ + scripts/elfun/csc.m \ + scripts/elfun/cscd.m \ + scripts/elfun/csch.m \ + scripts/elfun/sec.m \ + scripts/elfun/secd.m \ + scripts/elfun/sech.m \ + scripts/elfun/sind.m \ + scripts/elfun/tand.m -FCN_FILES += $(elfun_FCN_FILES) +FCN_FILES += $(scripts_elfun_FCN_FILES) -PKG_ADD_FILES += elfun/PKG_ADD +PKG_ADD_FILES += scripts/elfun/PKG_ADD -DIRSTAMP_FILES += elfun/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/elfun/$(octave_dirstamp)
--- a/scripts/general/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/general/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,87 +1,87 @@ -FCN_FILE_DIRS += general +FCN_FILE_DIRS += scripts/general -general_PRIVATE_FCN_FILES = \ - general/private/__isequal__.m \ - general/private/__splinen__.m +scripts_general_PRIVATE_FCN_FILES = \ + scripts/general/private/__isequal__.m \ + scripts/general/private/__splinen__.m -general_FCN_FILES = \ - general/accumarray.m \ - general/accumdim.m \ - general/bincoeff.m \ - general/bitcmp.m \ - general/bitget.m \ - general/bitset.m \ - general/blkdiag.m \ - general/cart2pol.m \ - general/cart2sph.m \ - general/cell2mat.m \ - general/celldisp.m \ - general/chop.m \ - general/circshift.m \ - general/common_size.m \ - general/cplxpair.m \ - general/cumtrapz.m \ - general/curl.m \ - general/dblquad.m \ - general/deal.m \ - general/del2.m \ - general/display.m \ - general/divergence.m \ - general/fieldnames.m \ - general/flip.m \ - general/flipdim.m \ - general/fliplr.m \ - general/flipud.m \ - general/gradient.m \ - general/idivide.m \ - general/inputParser.m \ - general/int2str.m \ - general/interp1.m \ - general/interp2.m \ - general/interp3.m \ - general/interpft.m \ - general/interpn.m \ - general/isdir.m \ - general/isequal.m \ - general/isequaln.m \ - general/loadobj.m \ - general/logspace.m \ - general/methods.m \ - general/nargchk.m \ - general/narginchk.m \ - general/nargoutchk.m \ - general/nextpow2.m \ - general/nthargout.m \ - general/num2str.m \ - general/pol2cart.m \ - general/polyarea.m \ - general/postpad.m \ - general/prepad.m \ - general/profexplore.m \ - general/profile.m \ - general/profshow.m \ - general/quadgk.m \ - general/quadl.m \ - general/quadv.m \ - general/randi.m \ - general/rat.m \ - general/repmat.m \ - general/rot90.m \ - general/rotdim.m \ - general/saveobj.m \ - general/shift.m \ - general/shiftdim.m \ - general/sortrows.m \ - general/sph2cart.m \ - general/structfun.m \ - general/subsindex.m \ - general/trapz.m \ - general/triplequad.m \ - general/validateattributes.m \ - $(general_PRIVATE_FCN_FILES) +scripts_general_FCN_FILES = \ + scripts/general/accumarray.m \ + scripts/general/accumdim.m \ + scripts/general/bincoeff.m \ + scripts/general/bitcmp.m \ + scripts/general/bitget.m \ + scripts/general/bitset.m \ + scripts/general/blkdiag.m \ + scripts/general/cart2pol.m \ + scripts/general/cart2sph.m \ + scripts/general/cell2mat.m \ + scripts/general/celldisp.m \ + scripts/general/chop.m \ + scripts/general/circshift.m \ + scripts/general/common_size.m \ + scripts/general/cplxpair.m \ + scripts/general/cumtrapz.m \ + scripts/general/curl.m \ + scripts/general/dblquad.m \ + scripts/general/deal.m \ + scripts/general/del2.m \ + scripts/general/display.m \ + scripts/general/divergence.m \ + scripts/general/fieldnames.m \ + scripts/general/flip.m \ + scripts/general/flipdim.m \ + scripts/general/fliplr.m \ + scripts/general/flipud.m \ + scripts/general/gradient.m \ + scripts/general/idivide.m \ + scripts/general/inputParser.m \ + scripts/general/int2str.m \ + scripts/general/interp1.m \ + scripts/general/interp2.m \ + scripts/general/interp3.m \ + scripts/general/interpft.m \ + scripts/general/interpn.m \ + scripts/general/isdir.m \ + scripts/general/isequal.m \ + scripts/general/isequaln.m \ + scripts/general/loadobj.m \ + scripts/general/logspace.m \ + scripts/general/methods.m \ + scripts/general/nargchk.m \ + scripts/general/narginchk.m \ + scripts/general/nargoutchk.m \ + scripts/general/nextpow2.m \ + scripts/general/nthargout.m \ + scripts/general/num2str.m \ + scripts/general/pol2cart.m \ + scripts/general/polyarea.m \ + scripts/general/postpad.m \ + scripts/general/prepad.m \ + scripts/general/profexplore.m \ + scripts/general/profile.m \ + scripts/general/profshow.m \ + scripts/general/quadgk.m \ + scripts/general/quadl.m \ + scripts/general/quadv.m \ + scripts/general/randi.m \ + scripts/general/rat.m \ + scripts/general/repmat.m \ + scripts/general/rot90.m \ + scripts/general/rotdim.m \ + scripts/general/saveobj.m \ + scripts/general/shift.m \ + scripts/general/shiftdim.m \ + scripts/general/sortrows.m \ + scripts/general/sph2cart.m \ + scripts/general/structfun.m \ + scripts/general/subsindex.m \ + scripts/general/trapz.m \ + scripts/general/triplequad.m \ + scripts/general/validateattributes.m \ + $(scripts_general_PRIVATE_FCN_FILES) -FCN_FILES += $(general_FCN_FILES) +FCN_FILES += $(scripts_general_FCN_FILES) -PKG_ADD_FILES += general/PKG_ADD +PKG_ADD_FILES += scripts/general/PKG_ADD -DIRSTAMP_FILES += general/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/general/$(octave_dirstamp)
--- a/scripts/geometry/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/geometry/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,22 +1,22 @@ -FCN_FILE_DIRS += geometry +FCN_FILE_DIRS += scripts/geometry -geometry_FCN_FILES = \ - geometry/convhull.m \ - geometry/delaunayn.m \ - geometry/delaunay.m \ - geometry/dsearch.m \ - geometry/dsearchn.m \ - geometry/griddata.m \ - geometry/griddata3.m \ - geometry/griddatan.m \ - geometry/inpolygon.m \ - geometry/rectint.m \ - geometry/tsearchn.m \ - geometry/voronoi.m \ - geometry/voronoin.m +scripts_geometry_FCN_FILES = \ + scripts/geometry/convhull.m \ + scripts/geometry/delaunayn.m \ + scripts/geometry/delaunay.m \ + scripts/geometry/dsearch.m \ + scripts/geometry/dsearchn.m \ + scripts/geometry/griddata.m \ + scripts/geometry/griddata3.m \ + scripts/geometry/griddatan.m \ + scripts/geometry/inpolygon.m \ + scripts/geometry/rectint.m \ + scripts/geometry/tsearchn.m \ + scripts/geometry/voronoi.m \ + scripts/geometry/voronoin.m -FCN_FILES += $(geometry_FCN_FILES) +FCN_FILES += $(scripts_geometry_FCN_FILES) -PKG_ADD_FILES += geometry/PKG_ADD +PKG_ADD_FILES += scripts/geometry/PKG_ADD -DIRSTAMP_FILES += geometry/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/geometry/$(octave_dirstamp)
--- a/scripts/gui/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/gui/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,44 +1,44 @@ -FCN_FILE_DIRS += gui +FCN_FILE_DIRS += scripts/gui -gui_PRIVATE_FCN_FILES = \ - gui/private/__file_filter__.m \ - gui/private/__fltk_file_filter__.m \ - gui/private/__get_funcname__.m \ - gui/private/__is_function__.m \ - gui/private/__uigetdir_fltk__.m \ - gui/private/__uigetfile_fltk__.m \ - gui/private/__uiobject_split_args__.m \ - gui/private/__uiputfile_fltk__.m \ - gui/private/message_dialog.m +scripts_gui_PRIVATE_FCN_FILES = \ + scripts/gui/private/__file_filter__.m \ + scripts/gui/private/__fltk_file_filter__.m \ + scripts/gui/private/__get_funcname__.m \ + scripts/gui/private/__is_function__.m \ + scripts/gui/private/__uigetdir_fltk__.m \ + scripts/gui/private/__uigetfile_fltk__.m \ + scripts/gui/private/__uiobject_split_args__.m \ + scripts/gui/private/__uiputfile_fltk__.m \ + scripts/gui/private/message_dialog.m -gui_FCN_FILES = \ - gui/errordlg.m \ - gui/guidata.m \ - gui/guihandles.m \ - gui/helpdlg.m \ - gui/inputdlg.m \ - gui/listdlg.m \ - gui/msgbox.m \ - gui/questdlg.m \ - gui/uicontextmenu.m \ - gui/uicontrol.m \ - gui/uigetdir.m \ - gui/uigetfile.m \ - gui/uimenu.m \ - gui/uipanel.m \ - gui/uipushtool.m \ - gui/uiputfile.m \ - gui/uiresume.m \ - gui/uitoggletool.m \ - gui/uitoolbar.m \ - gui/uiwait.m \ - gui/waitbar.m \ - gui/waitforbuttonpress.m \ - gui/warndlg.m \ - $(gui_PRIVATE_FCN_FILES) +scripts_gui_FCN_FILES = \ + scripts/gui/errordlg.m \ + scripts/gui/guidata.m \ + scripts/gui/guihandles.m \ + scripts/gui/helpdlg.m \ + scripts/gui/inputdlg.m \ + scripts/gui/listdlg.m \ + scripts/gui/msgbox.m \ + scripts/gui/questdlg.m \ + scripts/gui/uicontextmenu.m \ + scripts/gui/uicontrol.m \ + scripts/gui/uigetdir.m \ + scripts/gui/uigetfile.m \ + scripts/gui/uimenu.m \ + scripts/gui/uipanel.m \ + scripts/gui/uipushtool.m \ + scripts/gui/uiputfile.m \ + scripts/gui/uiresume.m \ + scripts/gui/uitoggletool.m \ + scripts/gui/uitoolbar.m \ + scripts/gui/uiwait.m \ + scripts/gui/waitbar.m \ + scripts/gui/waitforbuttonpress.m \ + scripts/gui/warndlg.m \ + $(scripts_gui_PRIVATE_FCN_FILES) -FCN_FILES += $(gui_FCN_FILES) +FCN_FILES += $(scripts_gui_FCN_FILES) -PKG_ADD_FILES += gui/PKG_ADD +PKG_ADD_FILES += scripts/gui/PKG_ADD -DIRSTAMP_FILES += gui/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/gui/$(octave_dirstamp)
--- a/scripts/help/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/help/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,25 +1,25 @@ -FCN_FILE_DIRS += help +FCN_FILE_DIRS += scripts/help -help_PRIVATE_FCN_FILES = \ - help/private/__additional_help_message__.m \ - help/private/__strip_html_tags__.m +scripts_help_PRIVATE_FCN_FILES = \ + scripts/help/private/__additional_help_message__.m \ + scripts/help/private/__strip_html_tags__.m -help_FCN_FILES = \ - help/__gripe_missing_component__.m \ - help/__makeinfo__.m \ - help/__unimplemented__.m \ - help/doc.m \ - help/doc_cache_create.m \ - help/get_first_help_sentence.m \ - help/help.m \ - help/lookfor.m \ - help/print_usage.m \ - help/type.m \ - help/which.m \ - $(help_PRIVATE_FCN_FILES) +scripts_help_FCN_FILES = \ + scripts/help/__gripe_missing_component__.m \ + scripts/help/__makeinfo__.m \ + scripts/help/__unimplemented__.m \ + scripts/help/doc.m \ + scripts/help/doc_cache_create.m \ + scripts/help/get_first_help_sentence.m \ + scripts/help/help.m \ + scripts/help/lookfor.m \ + scripts/help/print_usage.m \ + scripts/help/type.m \ + scripts/help/which.m \ + $(scripts_help_PRIVATE_FCN_FILES) -FCN_FILES += $(help_FCN_FILES) +FCN_FILES += $(scripts_help_FCN_FILES) -PKG_ADD_FILES += help/PKG_ADD +PKG_ADD_FILES += scripts/help/PKG_ADD -DIRSTAMP_FILES += help/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/help/$(octave_dirstamp)
--- a/scripts/image/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/image/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,64 +1,64 @@ -FCN_FILE_DIRS += image +FCN_FILE_DIRS += scripts/image -image_PRIVATE_FCN_FILES = \ - image/private/__imfinfo__.m \ - image/private/__imread__.m \ - image/private/__imwrite__.m \ - image/private/imageIO.m \ - image/private/imwrite_filename.m \ - image/private/ind2x.m +scripts_image_PRIVATE_FCN_FILES = \ + scripts/image/private/__imfinfo__.m \ + scripts/image/private/__imread__.m \ + scripts/image/private/__imwrite__.m \ + scripts/image/private/imageIO.m \ + scripts/image/private/imwrite_filename.m \ + scripts/image/private/ind2x.m -image_FCN_FILES = \ - image/autumn.m \ - image/bone.m \ - image/brighten.m \ - image/cmpermute.m \ - image/cmunique.m \ - image/colorcube.m \ - image/colormap.m \ - image/contrast.m \ - image/cool.m \ - image/copper.m \ - image/cubehelix.m \ - image/flag.m \ - image/gray.m \ - image/gray2ind.m \ - image/hot.m \ - image/hsv.m \ - image/hsv2rgb.m \ - image/iscolormap.m \ - image/image.m \ - image/imagesc.m \ - image/imfinfo.m \ - image/imformats.m \ - image/imread.m \ - image/imshow.m \ - image/imwrite.m \ - image/ind2gray.m \ - image/ind2rgb.m \ - image/jet.m \ - image/lines.m \ - image/ntsc2rgb.m \ - image/ocean.m \ - image/pink.m \ - image/prism.m \ - image/rainbow.m \ - image/rgb2hsv.m \ - image/rgb2ind.m \ - image/rgb2ntsc.m \ - image/rgbplot.m \ - image/spinmap.m \ - image/spring.m \ - image/summer.m \ - image/white.m \ - image/winter.m \ - $(image_PRIVATE_FCN_FILES) +scripts_image_FCN_FILES = \ + scripts/image/autumn.m \ + scripts/image/bone.m \ + scripts/image/brighten.m \ + scripts/image/cmpermute.m \ + scripts/image/cmunique.m \ + scripts/image/colorcube.m \ + scripts/image/colormap.m \ + scripts/image/contrast.m \ + scripts/image/cool.m \ + scripts/image/copper.m \ + scripts/image/cubehelix.m \ + scripts/image/flag.m \ + scripts/image/gray.m \ + scripts/image/gray2ind.m \ + scripts/image/hot.m \ + scripts/image/hsv.m \ + scripts/image/hsv2rgb.m \ + scripts/image/iscolormap.m \ + scripts/image/image.m \ + scripts/image/imagesc.m \ + scripts/image/imfinfo.m \ + scripts/image/imformats.m \ + scripts/image/imread.m \ + scripts/image/imshow.m \ + scripts/image/imwrite.m \ + scripts/image/ind2gray.m \ + scripts/image/ind2rgb.m \ + scripts/image/jet.m \ + scripts/image/lines.m \ + scripts/image/ntsc2rgb.m \ + scripts/image/ocean.m \ + scripts/image/pink.m \ + scripts/image/prism.m \ + scripts/image/rainbow.m \ + scripts/image/rgb2hsv.m \ + scripts/image/rgb2ind.m \ + scripts/image/rgb2ntsc.m \ + scripts/image/rgbplot.m \ + scripts/image/spinmap.m \ + scripts/image/spring.m \ + scripts/image/summer.m \ + scripts/image/white.m \ + scripts/image/winter.m \ + $(scripts_image_PRIVATE_FCN_FILES) -IMAGES += \ - image/default.img +SCRIPTS_IMAGES += \ + scripts/image/default.img -FCN_FILES += $(image_FCN_FILES) +FCN_FILES += $(scripts_image_FCN_FILES) -PKG_ADD_FILES += image/PKG_ADD +PKG_ADD_FILES += scripts/image/PKG_ADD -DIRSTAMP_FILES += image/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/image/$(octave_dirstamp)
--- a/scripts/io/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/io/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,19 +1,19 @@ -FCN_FILE_DIRS += io +FCN_FILE_DIRS += scripts/io -io_FCN_FILES = \ - io/beep.m \ - io/csvread.m \ - io/csvwrite.m \ - io/dlmwrite.m \ - io/fileread.m \ - io/importdata.m \ - io/is_valid_file_id.m \ - io/strread.m \ - io/textscan.m \ - io/textread.m +scripts_io_FCN_FILES = \ + scripts/io/beep.m \ + scripts/io/csvread.m \ + scripts/io/csvwrite.m \ + scripts/io/dlmwrite.m \ + scripts/io/fileread.m \ + scripts/io/importdata.m \ + scripts/io/is_valid_file_id.m \ + scripts/io/strread.m \ + scripts/io/textscan.m \ + scripts/io/textread.m -FCN_FILES += $(io_FCN_FILES) +FCN_FILES += $(scripts_io_FCN_FILES) -PKG_ADD_FILES += io/PKG_ADD +PKG_ADD_FILES += scripts/io/PKG_ADD -DIRSTAMP_FILES += io/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/io/$(octave_dirstamp)
--- a/scripts/java/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/java/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,24 +1,24 @@ -FCN_FILE_DIRS += java +FCN_FILE_DIRS += scripts/java -java_FCN_FILES = \ - java/java_get.m \ - java/java_set.m \ - java/javaArray.m \ - java/javaaddpath.m \ - java/javachk.m \ - java/javaclasspath.m \ - java/javamem.m \ - java/javarmpath.m \ - java/usejava.m +scripts_java_FCN_FILES = \ + scripts/java/java_get.m \ + scripts/java/java_set.m \ + scripts/java/javaArray.m \ + scripts/java/javaaddpath.m \ + scripts/java/javachk.m \ + scripts/java/javaclasspath.m \ + scripts/java/javamem.m \ + scripts/java/javarmpath.m \ + scripts/java/usejava.m -FCN_FILES += $(java_FCN_FILES) +FCN_FILES += $(scripts_java_FCN_FILES) -PKG_ADD_FILES += java/PKG_ADD +PKG_ADD_FILES += scripts/java/PKG_ADD -DIRSTAMP_FILES += java/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/java/$(octave_dirstamp) if AMCOND_HAVE_JAVA -JAR_FILES += java/octave.jar +JAR_FILES += scripts/java/octave.jar endif org_octave_dir = org/octave @@ -45,36 +45,36 @@ $(org_octave_dir)/images/information.png \ $(org_octave_dir)/images/octave.png -java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC)) +scripts_java_JAVA_SRC = $(addprefix scripts/java/, $(JAVA_SRC)) -java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES)) +scripts_java_JAVA_CLASSES = $(addprefix scripts/java/, $(JAVA_CLASSES)) -java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES)) +scripts_java_JAVA_IMAGES = $(addprefix scripts/java/, $(JAVA_IMAGES)) -srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES)) +srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES)) %.class : %.java - $(AM_V_GEN)$(MKDIR_P) java/$(org_octave_dir) && \ - ( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) ) + $(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \ + ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) ) -java/images.stamp: $(srcdir_java_JAVA_IMAGES) +scripts/java/images.stamp: $(srcdir_scripts_java_JAVA_IMAGES) $(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \ - $(MKDIR_P) java/$(org_octave_dir)/images; \ - cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \ + $(MKDIR_P) scripts/java/$(org_octave_dir)/images; \ + cp $(srcdir_scripts_java_JAVA_IMAGES) scripts/java/$(org_octave_dir)/images; \ fi && \ touch $@ if AMCOND_HAVE_JAVA -java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) +scripts/java/octave.jar: scripts/java/images.stamp $(scripts_java_JAVA_CLASSES) $(AM_V_GEN)rm -f $@-t $@ && \ - ( cd java; \ + ( cd scripts/java; \ "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \ mv $@-t $@ endif -EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) +EXTRA_DIST += $(JAR_FILES) $(scripts_java_JAVA_SRC) $(scripts_java_JAVA_IMAGES) -CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES) +CLEANFILES += $(JAR_FILES) $(scripts_java_JAVA_CLASSES) -DISTCLEANFILES += java/images.stamp +DISTCLEANFILES += scripts/java/images.stamp
--- a/scripts/linear-algebra/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/linear-algebra/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,38 +1,38 @@ -FCN_FILE_DIRS += linear-algebra +FCN_FILE_DIRS += scripts/linear-algebra -linear_algebra_FCN_FILES = \ - linear-algebra/bandwidth.m \ - linear-algebra/commutation_matrix.m \ - linear-algebra/cond.m \ - linear-algebra/condest.m \ - linear-algebra/cross.m \ - linear-algebra/duplication_matrix.m \ - linear-algebra/expm.m \ - linear-algebra/housh.m \ - linear-algebra/isbanded.m \ - linear-algebra/isdefinite.m \ - linear-algebra/isdiag.m \ - linear-algebra/ishermitian.m \ - linear-algebra/issymmetric.m \ - linear-algebra/istril.m \ - linear-algebra/istriu.m \ - linear-algebra/krylov.m \ - linear-algebra/linsolve.m \ - linear-algebra/logm.m \ - linear-algebra/normest.m \ - linear-algebra/null.m \ - linear-algebra/onenormest.m \ - linear-algebra/orth.m \ - linear-algebra/planerot.m \ - linear-algebra/qzhess.m \ - linear-algebra/rank.m \ - linear-algebra/rref.m \ - linear-algebra/subspace.m \ - linear-algebra/trace.m \ - linear-algebra/vech.m +scripts_linear_algebra_FCN_FILES = \ + scripts/linear-algebra/bandwidth.m \ + scripts/linear-algebra/commutation_matrix.m \ + scripts/linear-algebra/cond.m \ + scripts/linear-algebra/condest.m \ + scripts/linear-algebra/cross.m \ + scripts/linear-algebra/duplication_matrix.m \ + scripts/linear-algebra/expm.m \ + scripts/linear-algebra/housh.m \ + scripts/linear-algebra/isbanded.m \ + scripts/linear-algebra/isdefinite.m \ + scripts/linear-algebra/isdiag.m \ + scripts/linear-algebra/ishermitian.m \ + scripts/linear-algebra/issymmetric.m \ + scripts/linear-algebra/istril.m \ + scripts/linear-algebra/istriu.m \ + scripts/linear-algebra/krylov.m \ + scripts/linear-algebra/linsolve.m \ + scripts/linear-algebra/logm.m \ + scripts/linear-algebra/normest.m \ + scripts/linear-algebra/null.m \ + scripts/linear-algebra/onenormest.m \ + scripts/linear-algebra/orth.m \ + scripts/linear-algebra/planerot.m \ + scripts/linear-algebra/qzhess.m \ + scripts/linear-algebra/rank.m \ + scripts/linear-algebra/rref.m \ + scripts/linear-algebra/subspace.m \ + scripts/linear-algebra/trace.m \ + scripts/linear-algebra/vech.m -FCN_FILES += $(linear_algebra_FCN_FILES) +FCN_FILES += $(scripts_linear_algebra_FCN_FILES) -PKG_ADD_FILES += linear-algebra/PKG_ADD +PKG_ADD_FILES += scripts/linear-algebra/PKG_ADD -DIRSTAMP_FILES += linear-algebra/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/linear-algebra/$(octave_dirstamp)
--- a/scripts/miscellaneous/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/miscellaneous/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,88 +1,88 @@ -FCN_FILE_DIRS += miscellaneous +FCN_FILE_DIRS += scripts/miscellaneous -miscellaneous_PRIVATE_FCN_FILES = \ - miscellaneous/private/display_info_file.m \ - miscellaneous/private/__w2mpth__.m \ - miscellaneous/private/__xzip__.m +scripts_miscellaneous_PRIVATE_FCN_FILES = \ + scripts/miscellaneous/private/display_info_file.m \ + scripts/miscellaneous/private/__w2mpth__.m \ + scripts/miscellaneous/private/__xzip__.m -miscellaneous_FCN_FILES = \ - miscellaneous/ans.m \ - miscellaneous/bug_report.m \ - miscellaneous/bunzip2.m \ - miscellaneous/bzip2.m \ - miscellaneous/cast.m \ - miscellaneous/citation.m \ - miscellaneous/comma.m \ - miscellaneous/compare_versions.m \ - miscellaneous/computer.m \ - miscellaneous/copyfile.m \ - miscellaneous/debug.m \ - miscellaneous/delete.m \ - miscellaneous/desktop.m \ - miscellaneous/dir.m \ - miscellaneous/dos.m \ - miscellaneous/edit.m \ - miscellaneous/error_ids.m \ - miscellaneous/fact.m \ - miscellaneous/fileattrib.m \ - miscellaneous/fileparts.m \ - miscellaneous/fullfile.m \ - miscellaneous/genvarname.m \ - miscellaneous/getappdata.m \ - miscellaneous/getfield.m \ - miscellaneous/gunzip.m \ - miscellaneous/gzip.m \ - miscellaneous/info.m \ - miscellaneous/inputname.m \ - miscellaneous/isappdata.m \ - miscellaneous/isdeployed.m \ - miscellaneous/ismac.m \ - miscellaneous/ispc.m \ - miscellaneous/isunix.m \ - miscellaneous/license.m \ - miscellaneous/list_primes.m \ - miscellaneous/ls.m \ - miscellaneous/ls_command.m \ - miscellaneous/menu.m \ - miscellaneous/mex.m \ - miscellaneous/mexext.m \ - miscellaneous/mkoctfile.m \ - miscellaneous/movefile.m \ - miscellaneous/namelengthmax.m \ - miscellaneous/news.m \ - miscellaneous/open.m \ - miscellaneous/orderfields.m \ - miscellaneous/pack.m \ - miscellaneous/paren.m \ - miscellaneous/parseparams.m \ - miscellaneous/perl.m \ - miscellaneous/python.m \ - miscellaneous/recycle.m \ - miscellaneous/rmappdata.m \ - miscellaneous/run.m \ - miscellaneous/semicolon.m \ - miscellaneous/setappdata.m \ - miscellaneous/setfield.m \ - miscellaneous/substruct.m \ - miscellaneous/swapbytes.m \ - miscellaneous/symvar.m \ - miscellaneous/tar.m \ - miscellaneous/tempdir.m \ - miscellaneous/tmpnam.m \ - miscellaneous/unix.m \ - miscellaneous/unpack.m \ - miscellaneous/untar.m \ - miscellaneous/unzip.m \ - miscellaneous/ver.m \ - miscellaneous/version.m \ - miscellaneous/warning_ids.m \ - miscellaneous/what.m \ - miscellaneous/xor.m \ - miscellaneous/zip.m \ - $(miscellaneous_PRIVATE_FCN_FILES) +scripts_miscellaneous_FCN_FILES = \ + scripts/miscellaneous/ans.m \ + scripts/miscellaneous/bug_report.m \ + scripts/miscellaneous/bunzip2.m \ + scripts/miscellaneous/bzip2.m \ + scripts/miscellaneous/cast.m \ + scripts/miscellaneous/citation.m \ + scripts/miscellaneous/comma.m \ + scripts/miscellaneous/compare_versions.m \ + scripts/miscellaneous/computer.m \ + scripts/miscellaneous/copyfile.m \ + scripts/miscellaneous/debug.m \ + scripts/miscellaneous/delete.m \ + scripts/miscellaneous/desktop.m \ + scripts/miscellaneous/dir.m \ + scripts/miscellaneous/dos.m \ + scripts/miscellaneous/edit.m \ + scripts/miscellaneous/error_ids.m \ + scripts/miscellaneous/fact.m \ + scripts/miscellaneous/fileattrib.m \ + scripts/miscellaneous/fileparts.m \ + scripts/miscellaneous/fullfile.m \ + scripts/miscellaneous/genvarname.m \ + scripts/miscellaneous/getappdata.m \ + scripts/miscellaneous/getfield.m \ + scripts/miscellaneous/gunzip.m \ + scripts/miscellaneous/gzip.m \ + scripts/miscellaneous/info.m \ + scripts/miscellaneous/inputname.m \ + scripts/miscellaneous/isappdata.m \ + scripts/miscellaneous/isdeployed.m \ + scripts/miscellaneous/ismac.m \ + scripts/miscellaneous/ispc.m \ + scripts/miscellaneous/isunix.m \ + scripts/miscellaneous/license.m \ + scripts/miscellaneous/list_primes.m \ + scripts/miscellaneous/ls.m \ + scripts/miscellaneous/ls_command.m \ + scripts/miscellaneous/menu.m \ + scripts/miscellaneous/mex.m \ + scripts/miscellaneous/mexext.m \ + scripts/miscellaneous/mkoctfile.m \ + scripts/miscellaneous/movefile.m \ + scripts/miscellaneous/namelengthmax.m \ + scripts/miscellaneous/news.m \ + scripts/miscellaneous/open.m \ + scripts/miscellaneous/orderfields.m \ + scripts/miscellaneous/pack.m \ + scripts/miscellaneous/paren.m \ + scripts/miscellaneous/parseparams.m \ + scripts/miscellaneous/perl.m \ + scripts/miscellaneous/python.m \ + scripts/miscellaneous/recycle.m \ + scripts/miscellaneous/rmappdata.m \ + scripts/miscellaneous/run.m \ + scripts/miscellaneous/semicolon.m \ + scripts/miscellaneous/setappdata.m \ + scripts/miscellaneous/setfield.m \ + scripts/miscellaneous/substruct.m \ + scripts/miscellaneous/swapbytes.m \ + scripts/miscellaneous/symvar.m \ + scripts/miscellaneous/tar.m \ + scripts/miscellaneous/tempdir.m \ + scripts/miscellaneous/tmpnam.m \ + scripts/miscellaneous/unix.m \ + scripts/miscellaneous/unpack.m \ + scripts/miscellaneous/untar.m \ + scripts/miscellaneous/unzip.m \ + scripts/miscellaneous/ver.m \ + scripts/miscellaneous/version.m \ + scripts/miscellaneous/warning_ids.m \ + scripts/miscellaneous/what.m \ + scripts/miscellaneous/xor.m \ + scripts/miscellaneous/zip.m \ + $(scripts_miscellaneous_PRIVATE_FCN_FILES) -FCN_FILES += $(miscellaneous_FCN_FILES) +FCN_FILES += $(scripts_miscellaneous_FCN_FILES) -PKG_ADD_FILES += miscellaneous/PKG_ADD +PKG_ADD_FILES += scripts/miscellaneous/PKG_ADD -DIRSTAMP_FILES += miscellaneous/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/miscellaneous/$(octave_dirstamp)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -0,0 +1,218 @@ +## FIXME -- including scripts/@ftp/module.mk fails. Is that an automake bug? + +FCN_FILE_DIRS += scripts/@ftp + +scripts_@ftp_FCN_FILES = \ + scripts/@ftp/ascii.m \ + scripts/@ftp/binary.m \ + scripts/@ftp/cd.m \ + scripts/@ftp/close.m \ + scripts/@ftp/delete.m \ + scripts/@ftp/dir.m \ + scripts/@ftp/display.m \ + scripts/@ftp/ftp.m \ + scripts/@ftp/loadobj.m \ + scripts/@ftp/mget.m \ + scripts/@ftp/mkdir.m \ + scripts/@ftp/mput.m \ + scripts/@ftp/rename.m \ + scripts/@ftp/rmdir.m \ + scripts/@ftp/saveobj.m + +FCN_FILES += $(scripts_@ftp_FCN_FILES) + +PKG_ADD_FILES += scripts/@ftp/PKG_ADD + +DIRSTAMP_FILES += scripts/@ftp/$(octave_dirstamp) + +include scripts/audio/module.mk +include scripts/deprecated/module.mk +include scripts/elfun/module.mk +include scripts/general/module.mk +include scripts/geometry/module.mk +include scripts/gui/module.mk +include scripts/help/module.mk +include scripts/image/module.mk +include scripts/io/module.mk +include scripts/java/module.mk +include scripts/linear-algebra/module.mk +include scripts/miscellaneous/module.mk +include scripts/optimization/module.mk +include scripts/path/module.mk +include scripts/pkg/module.mk +include scripts/plot/appearance/module.mk +include scripts/plot/draw/module.mk +include scripts/plot/util/module.mk +include scripts/polynomial/module.mk +include scripts/prefs/module.mk +include scripts/set/module.mk +include scripts/signal/module.mk +include scripts/sparse/module.mk +include scripts/specfun/module.mk +include scripts/special-matrix/module.mk +include scripts/startup/module.mk +include scripts/statistics/base/module.mk +include scripts/statistics/distributions/module.mk +include scripts/statistics/models/module.mk +include scripts/statistics/tests/module.mk +include scripts/strings/module.mk +include scripts/testfun/module.mk +include scripts/time/module.mk + +nobase_fcnfile_DATA = $(FCN_FILES) $(GEN_FCN_FILES) $(JAR_FILES) + +image_DATA += $(SCRIPTS_IMAGES) + +FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in) + +ALL_LOCAL_TARGETS += \ + $(GEN_FCN_FILES) \ + $(PKG_ADD_FILES) \ + $(JAR_FILES) + +if AMCOND_BUILD_DOCS +ALL_LOCAL_TARGETS += scripts/.DOCSTRINGS +endif + +define PKG_ADD_FILE_TEMPLATE +$(1)/PKG_ADD: $$($(2)_FCN_FILES) $$($(2)_GEN_FCN_FILES) $(1)/$(octave_dirstamp) scripts/mk-pkg-add + $$(AM_V_GEN)rm -f $$@-t $$@ && \ + $$(srcdir)/scripts/mk-pkg-add $(srcdir) $$($(2)_FCN_FILES) -- $$($(2)_GEN_FCN_FILES) > $$@-t && \ + mv $$@-t $$@ +endef + +$(foreach d, $(FCN_FILE_DIRS), $(eval $(call PKG_ADD_FILE_TEMPLATE, $(d),$(subst /,_,$(subst -,_,$(d)))))) + +define GEN_FCN_FILES_TEMPLATE +$(1): $(1:.m=.in) Makefile $(dir $(1))$(octave_dirstamp) + $$(AM_V_GEN)$$(do_subst_config_vals) +endef + +$(foreach f, $(GEN_FCN_FILES), $(eval $(call GEN_FCN_FILES_TEMPLATE, $(f)))) + +if AMCOND_BUILD_DOCS + +scripts/.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) scripts/mkdoc.pl Makefile + $(AM_V_GEN)rm -f $@-t $@ && \ + if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/scripts/DOCSTRINGS ] && [ ! -f scripts/DOCSTRINGS ]; then \ + cp $(srcdir)/scripts/DOCSTRINGS scripts/DOCSTRINGS; \ + touch -r $(srcdir)/scripts/DOCSTRINGS scripts/DOCSTRINGS; \ + fi && \ + $(PERL) $(srcdir)/scripts/mkdoc.pl "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t && \ + mv $@-t $@ && \ + $(top_srcdir)/build-aux/move-if-change $@ scripts/DOCSTRINGS && \ + touch $@ + +OCTAVE_INTERPRETER_TARGETS += \ + scripts/.DOCSTRINGS + +endif + +check-m-sources: + @echo "checking whether files in source tree are listed in module.mk files..."; \ + for f in $$(find $(srcdir)/scripts -name '*.m'); do \ + found=false; \ + for m in $(FCN_FILES) $(GEN_FCN_FILES); do \ + if [ "$$f" = $(srcdir)/scripts/"$$m" ]; then \ + found=true; \ + break; \ + fi; \ + done; \ + if $$found; then \ + true; \ + else \ + missing=$$(echo $$f | $(SED) "s|^$(srcdir)/scripts||"); \ + echo "$$missing: not listed in SOURCES"; \ + fi; \ + done; \ + if test -z "$$missing"; then \ + echo "yes"; \ + fi +.PHONY: check-m-sources + +check-missing-semicolon: + @echo "checking for missing semicolons in .m files..." + ( echo "warning on Octave:missing-semicolon;"; \ + for m in $(addprefix $(srcdir), $(FCN_FILES)) $(GEN_FCN_FILES); do \ + echo "source ('$$m');"; \ + done ) | ../run-octave -qf +.PHONY: check-missing-semicolon + +## Add rule to generate ctags. +## Automake would normally generate such a rule, but only if there is a +## xxx_SOURCES target +ctags: + ctags $(addprefix $(srcdir)/, $(FCN_FILES)) $(GEN_FCN_FILES) + +install-data-local: install-startup-files install-pkg-add + +uninstall-local: uninstall-startup-files uninstall-pkg-add + +install-startup-files: + $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/startup + if test -f $(DESTDIR)$(fcnfiledir)/startup/octaverc; then true; \ + else \ + $(INSTALL_DATA) $(srcdir)/scripts/$(SYSTEM_STARTUP_FILE_SRC) \ + $(DESTDIR)$(fcnfiledir)/startup/octaverc; \ + fi + if test -f $(DESTDIR)$(fcnfiledir)/startup/inputrc; then true; \ + else \ + $(INSTALL_DATA) $(srcdir)/scripts/$(SYSTEM_INPUTRC_FILE_SRC) \ + $(DESTDIR)$(fcnfiledir)/startup/inputrc; \ + fi + $(MKDIR_P) $(DESTDIR)$(localfcnfiledir)/startup + if test -f $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ + then true; \ + else \ + $(INSTALL_DATA) $(srcdir)/scripts/$(LOCAL_STARTUP_FILE_SRC) \ + $(DESTDIR)$(localfcnfiledir)/startup/octaverc; \ + fi +.PHONY: install-startup-files + +uninstall-startup-files: + rm -f $(DESTDIR)$(fcnfiledir)/startup/octaverc + rm -f $(DESTDIR)$(fcnfiledir)/startup/inputrc + rm -f $(DESTDIR)$(localfcnfiledir)/startup/octaverc +.PHONY: uninstall-startup-files + +install-pkg-add: + for f in $(PKG_ADD_FILES); do \ + if [ -n "`cat $$f`" ]; then \ + $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/`echo $$f | $(SED) 's,/[^/]*$$,,'`; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$$f; \ + fi \ + done +.PHONY: install-pkg-add + +uninstall-pkg-add: + for f in $(PKG_ADD_FILES); do \ + rm -f $(DESTDIR)$(fcnfiledir)/$$f; \ + done +.PHONY: uninstall-pkg-add + +if AMCOND_HAVE_JAVA +else +scripts-dist-hook: + @echo "Packaging distribution requires Java." ; exit 1; +endif + +EXTRA_DIST += \ + $(SCRIPTS_IMAGES) \ + $(FCN_FILES) \ + $(FCN_FILES_IN) \ + $(GEN_FCN_FILES) \ + scripts/DOCSTRINGS \ + scripts/mkdoc.pl \ + scripts/mk-pkg-add + +DISTCLEANFILES += \ + scripts/.DOCSTRINGS \ + scripts/DOCSTRINGS \ + $(PKG_ADD_FILES) \ + $(DIRSTAMP_FILES) \ + $(GEN_FCN_FILES) + +scripts-distclean: + if [ "x$(srcdir)" != "x." ]; then \ + rm -f $(java_JAVA_IMAGES); \ + fi
--- a/scripts/optimization/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/optimization/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,26 +1,26 @@ -FCN_FILE_DIRS += optimization +FCN_FILE_DIRS += scripts/optimization -optimization_PRIVATE_FCN_FILES = \ - optimization/private/__fdjac__.m +scripts_optimization_PRIVATE_FCN_FILES = \ + scripts/optimization/private/__fdjac__.m -optimization_FCN_FILES = \ - optimization/__all_opts__.m \ - optimization/fminbnd.m \ - optimization/fminsearch.m \ - optimization/fminunc.m \ - optimization/fsolve.m \ - optimization/fzero.m \ - optimization/glpk.m \ - optimization/lsqnonneg.m \ - optimization/optimget.m \ - optimization/optimset.m \ - optimization/pqpnonneg.m \ - optimization/qp.m \ - optimization/sqp.m \ - $(optimization_PRIVATE_FCN_FILES) +scripts_optimization_FCN_FILES = \ + scripts/optimization/__all_opts__.m \ + scripts/optimization/fminbnd.m \ + scripts/optimization/fminsearch.m \ + scripts/optimization/fminunc.m \ + scripts/optimization/fsolve.m \ + scripts/optimization/fzero.m \ + scripts/optimization/glpk.m \ + scripts/optimization/lsqnonneg.m \ + scripts/optimization/optimget.m \ + scripts/optimization/optimset.m \ + scripts/optimization/pqpnonneg.m \ + scripts/optimization/qp.m \ + scripts/optimization/sqp.m \ + $(scripts_optimization_PRIVATE_FCN_FILES) -FCN_FILES += $(optimization_FCN_FILES) +FCN_FILES += $(scripts_optimization_FCN_FILES) -PKG_ADD_FILES += optimization/PKG_ADD +PKG_ADD_FILES += scripts/optimization/PKG_ADD -DIRSTAMP_FILES += optimization/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/optimization/$(octave_dirstamp)
--- a/scripts/path/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/path/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,16 +1,16 @@ -FCN_FILE_DIRS += path +FCN_FILE_DIRS += scripts/path -path_PRIVATE_FCN_FILES = \ - path/private/getsavepath.m +scripts_path_PRIVATE_FCN_FILES = \ + scripts/path/private/getsavepath.m -path_FCN_FILES = \ - path/matlabroot.m \ - path/pathdef.m \ - path/savepath.m \ - $(path_PRIVATE_FCN_FILES) +scripts_path_FCN_FILES = \ + scripts/path/matlabroot.m \ + scripts/path/pathdef.m \ + scripts/path/savepath.m \ + $(scripts_path_PRIVATE_FCN_FILES) -FCN_FILES += $(path_FCN_FILES) +FCN_FILES += $(scripts_path_FCN_FILES) -PKG_ADD_FILES += path/PKG_ADD +PKG_ADD_FILES += scripts/path/PKG_ADD -DIRSTAMP_FILES += path/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/path/$(octave_dirstamp)
--- a/scripts/pkg/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/pkg/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,52 +1,52 @@ -FCN_FILE_DIRS += pkg +FCN_FILE_DIRS += scripts/pkg -pkg_PRIVATE_FCN_FILES = \ - pkg/private/build.m \ - pkg/private/configure_make.m \ - pkg/private/copy_files.m \ - pkg/private/create_pkgadddel.m \ - pkg/private/default_prefix.m \ - pkg/private/describe.m \ - pkg/private/dirempty.m \ - pkg/private/extract_pkg.m \ - pkg/private/finish_installation.m \ - pkg/private/fix_depends.m \ - pkg/private/fix_version.m \ - pkg/private/generate_lookfor_cache.m \ - pkg/private/get_description.m \ - pkg/private/get_forge_download.m \ - pkg/private/get_forge_pkg.m \ - pkg/private/getarch.m \ - pkg/private/getarchdir.m \ - pkg/private/getarchprefix.m \ - pkg/private/get_unsatisfied_deps.m \ - pkg/private/install.m \ - pkg/private/installed_packages.m \ - pkg/private/is_architecture_dependent.m \ - pkg/private/list_forge_packages.m \ - pkg/private/load_package_dirs.m \ - pkg/private/load_packages.m \ - pkg/private/load_packages_and_dependencies.m \ - pkg/private/packinfo_copy_file.m \ - pkg/private/parse_pkg_idx.m \ - pkg/private/prepare_installation.m \ - pkg/private/print_package_description.m \ - pkg/private/rebuild.m \ - pkg/private/repackage.m \ - pkg/private/save_order.m \ - pkg/private/shell.m \ - pkg/private/uninstall.m \ - pkg/private/unload_packages.m \ - pkg/private/verify_directory.m \ - pkg/private/write_index.m +scripts_pkg_PRIVATE_FCN_FILES = \ + scripts/pkg/private/build.m \ + scripts/pkg/private/configure_make.m \ + scripts/pkg/private/copy_files.m \ + scripts/pkg/private/create_pkgadddel.m \ + scripts/pkg/private/default_prefix.m \ + scripts/pkg/private/describe.m \ + scripts/pkg/private/dirempty.m \ + scripts/pkg/private/extract_pkg.m \ + scripts/pkg/private/finish_installation.m \ + scripts/pkg/private/fix_depends.m \ + scripts/pkg/private/fix_version.m \ + scripts/pkg/private/generate_lookfor_cache.m \ + scripts/pkg/private/get_description.m \ + scripts/pkg/private/get_forge_download.m \ + scripts/pkg/private/get_forge_pkg.m \ + scripts/pkg/private/getarch.m \ + scripts/pkg/private/getarchdir.m \ + scripts/pkg/private/getarchprefix.m \ + scripts/pkg/private/get_unsatisfied_deps.m \ + scripts/pkg/private/install.m \ + scripts/pkg/private/installed_packages.m \ + scripts/pkg/private/is_architecture_dependent.m \ + scripts/pkg/private/list_forge_packages.m \ + scripts/pkg/private/load_package_dirs.m \ + scripts/pkg/private/load_packages.m \ + scripts/pkg/private/load_packages_and_dependencies.m \ + scripts/pkg/private/packinfo_copy_file.m \ + scripts/pkg/private/parse_pkg_idx.m \ + scripts/pkg/private/prepare_installation.m \ + scripts/pkg/private/print_package_description.m \ + scripts/pkg/private/rebuild.m \ + scripts/pkg/private/repackage.m \ + scripts/pkg/private/save_order.m \ + scripts/pkg/private/shell.m \ + scripts/pkg/private/uninstall.m \ + scripts/pkg/private/unload_packages.m \ + scripts/pkg/private/verify_directory.m \ + scripts/pkg/private/write_index.m -pkg_FCN_FILES = \ - pkg/pkg.m \ - $(pkg_PRIVATE_FCN_FILES) +scripts_pkg_FCN_FILES = \ + scripts/pkg/pkg.m \ + $(scripts_pkg_PRIVATE_FCN_FILES) -FCN_FILES += $(pkg_FCN_FILES) +FCN_FILES += $(scripts_pkg_FCN_FILES) -PKG_ADD_FILES += pkg/PKG_ADD +PKG_ADD_FILES += scripts/pkg/PKG_ADD -DIRSTAMP_FILES += pkg/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/pkg/$(octave_dirstamp)
--- a/scripts/plot/appearance/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/plot/appearance/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,43 +1,43 @@ -FCN_FILE_DIRS += plot/appearance +FCN_FILE_DIRS += scripts/plot/appearance -plot_appearance_PRIVATE_FCN_FILES = \ - plot/appearance/private/__axis_limits__.m \ - plot/appearance/private/__axis_label__.m +scripts_plot_appearance_PRIVATE_FCN_FILES = \ + scripts/plot/appearance/private/__axis_limits__.m \ + scripts/plot/appearance/private/__axis_label__.m -plot_appearance_FCN_FILES = \ - plot/appearance/__clabel__.m \ - plot/appearance/__getlegenddata__.m \ - plot/appearance/annotation.m \ - plot/appearance/axis.m \ - plot/appearance/box.m \ - plot/appearance/caxis.m \ - plot/appearance/clabel.m \ - plot/appearance/daspect.m \ - plot/appearance/datetick.m \ - plot/appearance/diffuse.m \ - plot/appearance/grid.m \ - plot/appearance/gtext.m \ - plot/appearance/hidden.m \ - plot/appearance/legend.m \ - plot/appearance/orient.m \ - plot/appearance/pbaspect.m \ - plot/appearance/shading.m \ - plot/appearance/specular.m \ - plot/appearance/text.m \ - plot/appearance/title.m \ - plot/appearance/view.m \ - plot/appearance/whitebg.m \ - plot/appearance/xlabel.m \ - plot/appearance/xlim.m \ - plot/appearance/ylabel.m \ - plot/appearance/ylim.m \ - plot/appearance/zlabel.m \ - plot/appearance/zlim.m \ - $(plot_appearance_PRIVATE_FCN_FILES) +scripts_plot_appearance_FCN_FILES = \ + scripts/plot/appearance/__clabel__.m \ + scripts/plot/appearance/__getlegenddata__.m \ + scripts/plot/appearance/annotation.m \ + scripts/plot/appearance/axis.m \ + scripts/plot/appearance/box.m \ + scripts/plot/appearance/caxis.m \ + scripts/plot/appearance/clabel.m \ + scripts/plot/appearance/daspect.m \ + scripts/plot/appearance/datetick.m \ + scripts/plot/appearance/diffuse.m \ + scripts/plot/appearance/grid.m \ + scripts/plot/appearance/gtext.m \ + scripts/plot/appearance/hidden.m \ + scripts/plot/appearance/legend.m \ + scripts/plot/appearance/orient.m \ + scripts/plot/appearance/pbaspect.m \ + scripts/plot/appearance/shading.m \ + scripts/plot/appearance/specular.m \ + scripts/plot/appearance/text.m \ + scripts/plot/appearance/title.m \ + scripts/plot/appearance/view.m \ + scripts/plot/appearance/whitebg.m \ + scripts/plot/appearance/xlabel.m \ + scripts/plot/appearance/xlim.m \ + scripts/plot/appearance/ylabel.m \ + scripts/plot/appearance/ylim.m \ + scripts/plot/appearance/zlabel.m \ + scripts/plot/appearance/zlim.m \ + $(scripts_plot_appearance_PRIVATE_FCN_FILES) -FCN_FILES += $(plot_appearance_FCN_FILES) +FCN_FILES += $(scripts_plot_appearance_FCN_FILES) -PKG_ADD_FILES += plot/appearance/PKG_ADD +PKG_ADD_FILES += scripts/plot/appearance/PKG_ADD -DIRSTAMP_FILES += plot/appearance/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/plot/appearance/$(octave_dirstamp)
--- a/scripts/plot/draw/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/plot/draw/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,104 +1,104 @@ -FCN_FILE_DIRS += plot/draw +FCN_FILE_DIRS += scripts/plot/draw -plot_draw_PRIVATE_FCN_FILES = \ - plot/draw/private/__add_datasource__.m \ - plot/draw/private/__bar__.m \ - plot/draw/private/__contour__.m \ - plot/draw/private/__errcomm__.m \ - plot/draw/private/__errplot__.m \ - plot/draw/private/__ezplot__.m \ - plot/draw/private/__interp_cube__.m \ - plot/draw/private/__line__.m \ - plot/draw/private/__marching_cube__.m \ - plot/draw/private/__patch__.m \ - plot/draw/private/__pie__.m \ - plot/draw/private/__plt__.m \ - plot/draw/private/__quiver__.m \ - plot/draw/private/__scatter__.m \ - plot/draw/private/__stem__.m +scripts_plot_draw_PRIVATE_FCN_FILES = \ + scripts/plot/draw/private/__add_datasource__.m \ + scripts/plot/draw/private/__bar__.m \ + scripts/plot/draw/private/__contour__.m \ + scripts/plot/draw/private/__errcomm__.m \ + scripts/plot/draw/private/__errplot__.m \ + scripts/plot/draw/private/__ezplot__.m \ + scripts/plot/draw/private/__interp_cube__.m \ + scripts/plot/draw/private/__line__.m \ + scripts/plot/draw/private/__marching_cube__.m \ + scripts/plot/draw/private/__patch__.m \ + scripts/plot/draw/private/__pie__.m \ + scripts/plot/draw/private/__plt__.m \ + scripts/plot/draw/private/__quiver__.m \ + scripts/plot/draw/private/__scatter__.m \ + scripts/plot/draw/private/__stem__.m -plot_draw_FCN_FILES = \ - plot/draw/area.m \ - plot/draw/barh.m \ - plot/draw/bar.m \ - plot/draw/colorbar.m \ - plot/draw/comet3.m \ - plot/draw/comet.m \ - plot/draw/compass.m \ - plot/draw/contour3.m \ - plot/draw/contourc.m \ - plot/draw/contourf.m \ - plot/draw/contour.m \ - plot/draw/cylinder.m \ - plot/draw/ellipsoid.m \ - plot/draw/errorbar.m \ - plot/draw/ezcontourf.m \ - plot/draw/ezcontour.m \ - plot/draw/ezmeshc.m \ - plot/draw/ezmesh.m \ - plot/draw/ezplot3.m \ - plot/draw/ezplot.m \ - plot/draw/ezpolar.m \ - plot/draw/ezsurfc.m \ - plot/draw/ezsurf.m \ - plot/draw/feather.m \ - plot/draw/fill.m \ - plot/draw/fplot.m \ - plot/draw/hist.m \ - plot/draw/isocolors.m \ - plot/draw/isonormals.m \ - plot/draw/isosurface.m \ - plot/draw/line.m \ - plot/draw/loglogerr.m \ - plot/draw/loglog.m \ - plot/draw/meshc.m \ - plot/draw/mesh.m \ - plot/draw/meshz.m \ - plot/draw/pareto.m \ - plot/draw/patch.m \ - plot/draw/pcolor.m \ - plot/draw/peaks.m \ - plot/draw/pie3.m \ - plot/draw/pie.m \ - plot/draw/plot3.m \ - plot/draw/plot.m \ - plot/draw/plotmatrix.m \ - plot/draw/plotyy.m \ - plot/draw/polar.m \ - plot/draw/quiver3.m \ - plot/draw/quiver.m \ - plot/draw/rectangle.m \ - plot/draw/ribbon.m \ - plot/draw/rose.m \ - plot/draw/scatter3.m \ - plot/draw/scatter.m \ - plot/draw/semilogxerr.m \ - plot/draw/semilogx.m \ - plot/draw/semilogyerr.m \ - plot/draw/semilogy.m \ - plot/draw/shrinkfaces.m \ - plot/draw/slice.m \ - plot/draw/sombrero.m \ - plot/draw/sphere.m \ - plot/draw/stairs.m \ - plot/draw/stem3.m \ - plot/draw/stemleaf.m \ - plot/draw/stem.m \ - plot/draw/surface.m \ - plot/draw/surfc.m \ - plot/draw/surfl.m \ - plot/draw/surf.m \ - plot/draw/surfnorm.m \ - plot/draw/tetramesh.m \ - plot/draw/trimesh.m \ - plot/draw/triplot.m \ - plot/draw/trisurf.m \ - plot/draw/waterfall.m \ - $(plot_draw_PRIVATE_FCN_FILES) +scripts_plot_draw_FCN_FILES = \ + scripts/plot/draw/area.m \ + scripts/plot/draw/barh.m \ + scripts/plot/draw/bar.m \ + scripts/plot/draw/colorbar.m \ + scripts/plot/draw/comet3.m \ + scripts/plot/draw/comet.m \ + scripts/plot/draw/compass.m \ + scripts/plot/draw/contour3.m \ + scripts/plot/draw/contourc.m \ + scripts/plot/draw/contourf.m \ + scripts/plot/draw/contour.m \ + scripts/plot/draw/cylinder.m \ + scripts/plot/draw/ellipsoid.m \ + scripts/plot/draw/errorbar.m \ + scripts/plot/draw/ezcontourf.m \ + scripts/plot/draw/ezcontour.m \ + scripts/plot/draw/ezmeshc.m \ + scripts/plot/draw/ezmesh.m \ + scripts/plot/draw/ezplot3.m \ + scripts/plot/draw/ezplot.m \ + scripts/plot/draw/ezpolar.m \ + scripts/plot/draw/ezsurfc.m \ + scripts/plot/draw/ezsurf.m \ + scripts/plot/draw/feather.m \ + scripts/plot/draw/fill.m \ + scripts/plot/draw/fplot.m \ + scripts/plot/draw/hist.m \ + scripts/plot/draw/isocolors.m \ + scripts/plot/draw/isonormals.m \ + scripts/plot/draw/isosurface.m \ + scripts/plot/draw/line.m \ + scripts/plot/draw/loglogerr.m \ + scripts/plot/draw/loglog.m \ + scripts/plot/draw/meshc.m \ + scripts/plot/draw/mesh.m \ + scripts/plot/draw/meshz.m \ + scripts/plot/draw/pareto.m \ + scripts/plot/draw/patch.m \ + scripts/plot/draw/pcolor.m \ + scripts/plot/draw/peaks.m \ + scripts/plot/draw/pie3.m \ + scripts/plot/draw/pie.m \ + scripts/plot/draw/plot3.m \ + scripts/plot/draw/plot.m \ + scripts/plot/draw/plotmatrix.m \ + scripts/plot/draw/plotyy.m \ + scripts/plot/draw/polar.m \ + scripts/plot/draw/quiver3.m \ + scripts/plot/draw/quiver.m \ + scripts/plot/draw/rectangle.m \ + scripts/plot/draw/ribbon.m \ + scripts/plot/draw/rose.m \ + scripts/plot/draw/scatter3.m \ + scripts/plot/draw/scatter.m \ + scripts/plot/draw/semilogxerr.m \ + scripts/plot/draw/semilogx.m \ + scripts/plot/draw/semilogyerr.m \ + scripts/plot/draw/semilogy.m \ + scripts/plot/draw/shrinkfaces.m \ + scripts/plot/draw/slice.m \ + scripts/plot/draw/sombrero.m \ + scripts/plot/draw/sphere.m \ + scripts/plot/draw/stairs.m \ + scripts/plot/draw/stem3.m \ + scripts/plot/draw/stemleaf.m \ + scripts/plot/draw/stem.m \ + scripts/plot/draw/surface.m \ + scripts/plot/draw/surfc.m \ + scripts/plot/draw/surfl.m \ + scripts/plot/draw/surf.m \ + scripts/plot/draw/surfnorm.m \ + scripts/plot/draw/tetramesh.m \ + scripts/plot/draw/trimesh.m \ + scripts/plot/draw/triplot.m \ + scripts/plot/draw/trisurf.m \ + scripts/plot/draw/waterfall.m \ + $(scripts_plot_draw_PRIVATE_FCN_FILES) -FCN_FILES += $(plot_draw_FCN_FILES) +FCN_FILES += $(scripts_plot_draw_FCN_FILES) -PKG_ADD_FILES += plot/draw/PKG_ADD +PKG_ADD_FILES += scripts/plot/draw/PKG_ADD -DIRSTAMP_FILES += plot/draw/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/plot/draw/$(octave_dirstamp)
--- a/scripts/plot/util/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/plot/util/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,88 +1,88 @@ -FCN_FILE_DIRS += plot/util +FCN_FILE_DIRS += scripts/plot/util -plot_util_GEN_FCN_FILES = \ - plot/util/gnuplot_binary.m +scripts_plot_util_GEN_FCN_FILES = \ + scripts/plot/util/gnuplot_binary.m -GEN_FCN_FILES += $(plot_util_GEN_FCN_FILES) +GEN_FCN_FILES += $(scripts_plot_util_GEN_FCN_FILES) -plot_util_PRIVATE_FCN_FILES = \ - plot/util/private/__add_default_menu__.m \ - plot/util/private/__ghostscript__.m \ - plot/util/private/__gnuplot_get_var__.m \ - plot/util/private/__gnuplot_ginput__.m \ - plot/util/private/__gnuplot_has_feature__.m \ - plot/util/private/__gnuplot_has_terminal__.m \ - plot/util/private/__gnuplot_open_stream__.m \ - plot/util/private/__gnuplot_print__.m \ - plot/util/private/__gnuplot_version__.m \ - plot/util/private/__go_draw_axes__.m \ - plot/util/private/__go_draw_figure__.m \ - plot/util/private/__opengl_print__.m \ - plot/util/private/__print_parse_opts__.m \ - plot/util/private/__tight_eps_bbox__.m +scripts_plot_util_PRIVATE_FCN_FILES = \ + scripts/plot/util/private/__add_default_menu__.m \ + scripts/plot/util/private/__ghostscript__.m \ + scripts/plot/util/private/__gnuplot_get_var__.m \ + scripts/plot/util/private/__gnuplot_ginput__.m \ + scripts/plot/util/private/__gnuplot_has_feature__.m \ + scripts/plot/util/private/__gnuplot_has_terminal__.m \ + scripts/plot/util/private/__gnuplot_open_stream__.m \ + scripts/plot/util/private/__gnuplot_print__.m \ + scripts/plot/util/private/__gnuplot_version__.m \ + scripts/plot/util/private/__go_draw_axes__.m \ + scripts/plot/util/private/__go_draw_figure__.m \ + scripts/plot/util/private/__opengl_print__.m \ + scripts/plot/util/private/__print_parse_opts__.m \ + scripts/plot/util/private/__tight_eps_bbox__.m -plot_util_FCN_FILES = \ - plot/util/__actual_axis_position__.m \ - plot/util/allchild.m \ - plot/util/ancestor.m \ - plot/util/axes.m \ - plot/util/cla.m \ - plot/util/clf.m \ - plot/util/close.m \ - plot/util/closereq.m \ - plot/util/colstyle.m \ - plot/util/copyobj.m \ - plot/util/__default_plot_options__.m \ - plot/util/figure.m \ - plot/util/findall.m \ - plot/util/findfigs.m \ - plot/util/findobj.m \ - plot/util/frame2im.m \ - plot/util/gca.m \ - plot/util/gcbf.m \ - plot/util/gcbo.m \ - plot/util/gcf.m \ - plot/util/gco.m \ - plot/util/ginput.m \ - plot/util/__gnuplot_drawnow__.m \ - plot/util/graphics_toolkit.m \ - plot/util/hdl2struct.m \ - plot/util/hggroup.m \ - plot/util/hgload.m \ - plot/util/hgsave.m \ - plot/util/hold.m \ - plot/util/im2frame.m \ - plot/util/isaxes.m \ - plot/util/isfigure.m \ - plot/util/ishghandle.m \ - plot/util/ishold.m \ - plot/util/isprop.m \ - plot/util/linkaxes.m \ - plot/util/linkprop.m \ - plot/util/meshgrid.m \ - plot/util/ndgrid.m \ - plot/util/newplot.m \ - plot/util/__next_line_color__.m \ - plot/util/__next_line_style__.m \ - plot/util/pan.m \ - plot/util/__plt_get_axis_arg__.m \ - plot/util/__pltopt__.m \ - plot/util/printd.m \ - plot/util/print.m \ - plot/util/refreshdata.m \ - plot/util/refresh.m \ - plot/util/rotate.m \ - plot/util/rotate3d.m \ - plot/util/saveas.m \ - plot/util/shg.m \ - plot/util/struct2hdl.m \ - plot/util/subplot.m \ - plot/util/zoom.m \ - $(plot_util_PRIVATE_FCN_FILES) +scripts_plot_util_FCN_FILES = \ + scripts/plot/util/__actual_axis_position__.m \ + scripts/plot/util/allchild.m \ + scripts/plot/util/ancestor.m \ + scripts/plot/util/axes.m \ + scripts/plot/util/cla.m \ + scripts/plot/util/clf.m \ + scripts/plot/util/close.m \ + scripts/plot/util/closereq.m \ + scripts/plot/util/colstyle.m \ + scripts/plot/util/copyobj.m \ + scripts/plot/util/__default_plot_options__.m \ + scripts/plot/util/figure.m \ + scripts/plot/util/findall.m \ + scripts/plot/util/findfigs.m \ + scripts/plot/util/findobj.m \ + scripts/plot/util/frame2im.m \ + scripts/plot/util/gca.m \ + scripts/plot/util/gcbf.m \ + scripts/plot/util/gcbo.m \ + scripts/plot/util/gcf.m \ + scripts/plot/util/gco.m \ + scripts/plot/util/ginput.m \ + scripts/plot/util/__gnuplot_drawnow__.m \ + scripts/plot/util/graphics_toolkit.m \ + scripts/plot/util/hdl2struct.m \ + scripts/plot/util/hggroup.m \ + scripts/plot/util/hgload.m \ + scripts/plot/util/hgsave.m \ + scripts/plot/util/hold.m \ + scripts/plot/util/im2frame.m \ + scripts/plot/util/isaxes.m \ + scripts/plot/util/isfigure.m \ + scripts/plot/util/ishghandle.m \ + scripts/plot/util/ishold.m \ + scripts/plot/util/isprop.m \ + scripts/plot/util/linkaxes.m \ + scripts/plot/util/linkprop.m \ + scripts/plot/util/meshgrid.m \ + scripts/plot/util/ndgrid.m \ + scripts/plot/util/newplot.m \ + scripts/plot/util/__next_line_color__.m \ + scripts/plot/util/__next_line_style__.m \ + scripts/plot/util/pan.m \ + scripts/plot/util/__plt_get_axis_arg__.m \ + scripts/plot/util/__pltopt__.m \ + scripts/plot/util/printd.m \ + scripts/plot/util/print.m \ + scripts/plot/util/refreshdata.m \ + scripts/plot/util/refresh.m \ + scripts/plot/util/rotate.m \ + scripts/plot/util/rotate3d.m \ + scripts/plot/util/saveas.m \ + scripts/plot/util/shg.m \ + scripts/plot/util/struct2hdl.m \ + scripts/plot/util/subplot.m \ + scripts/plot/util/zoom.m \ + $(scripts_plot_util_PRIVATE_FCN_FILES) -FCN_FILES += $(plot_util_FCN_FILES) +FCN_FILES += $(scripts_plot_util_FCN_FILES) -PKG_ADD_FILES += plot/util/PKG_ADD +PKG_ADD_FILES += scripts/plot/util/PKG_ADD -DIRSTAMP_FILES += plot/util/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/plot/util/$(octave_dirstamp)
--- a/scripts/polynomial/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/polynomial/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,39 +1,39 @@ -FCN_FILE_DIRS += polynomial +FCN_FILE_DIRS += scripts/polynomial -polynomial_PRIVATE_FCN_FILES = \ - polynomial/private/__splinefit__.m +scripts_polynomial_PRIVATE_FCN_FILES = \ + scripts/polynomial/private/__splinefit__.m -polynomial_FCN_FILES = \ - polynomial/compan.m \ - polynomial/conv.m \ - polynomial/deconv.m \ - polynomial/mkpp.m \ - polynomial/mpoles.m \ - polynomial/pchip.m \ - polynomial/poly.m \ - polynomial/polyaffine.m \ - polynomial/polyder.m \ - polynomial/polyeig.m \ - polynomial/polyfit.m \ - polynomial/polygcd.m \ - polynomial/polyint.m \ - polynomial/polyout.m \ - polynomial/polyreduce.m \ - polynomial/polyval.m \ - polynomial/polyvalm.m \ - polynomial/ppval.m \ - polynomial/ppder.m \ - polynomial/ppint.m \ - polynomial/ppjumps.m \ - polynomial/residue.m \ - polynomial/roots.m \ - polynomial/spline.m \ - polynomial/splinefit.m \ - polynomial/unmkpp.m \ - $(polynomial_PRIVATE_FCN_FILES) +scripts_polynomial_FCN_FILES = \ + scripts/polynomial/compan.m \ + scripts/polynomial/conv.m \ + scripts/polynomial/deconv.m \ + scripts/polynomial/mkpp.m \ + scripts/polynomial/mpoles.m \ + scripts/polynomial/pchip.m \ + scripts/polynomial/poly.m \ + scripts/polynomial/polyaffine.m \ + scripts/polynomial/polyder.m \ + scripts/polynomial/polyeig.m \ + scripts/polynomial/polyfit.m \ + scripts/polynomial/polygcd.m \ + scripts/polynomial/polyint.m \ + scripts/polynomial/polyout.m \ + scripts/polynomial/polyreduce.m \ + scripts/polynomial/polyval.m \ + scripts/polynomial/polyvalm.m \ + scripts/polynomial/ppval.m \ + scripts/polynomial/ppder.m \ + scripts/polynomial/ppint.m \ + scripts/polynomial/ppjumps.m \ + scripts/polynomial/residue.m \ + scripts/polynomial/roots.m \ + scripts/polynomial/spline.m \ + scripts/polynomial/splinefit.m \ + scripts/polynomial/unmkpp.m \ + $(scripts_polynomial_PRIVATE_FCN_FILES) -FCN_FILES += $(polynomial_FCN_FILES) +FCN_FILES += $(scripts_polynomial_FCN_FILES) -PKG_ADD_FILES += polynomial/PKG_ADD +PKG_ADD_FILES += scripts/polynomial/PKG_ADD -DIRSTAMP_FILES += polynomial/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/polynomial/$(octave_dirstamp)
--- a/scripts/prefs/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/prefs/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,22 +1,22 @@ -FCN_FILE_DIRS += prefs +FCN_FILE_DIRS += scripts/prefs -prefs_PRIVATE_FCN_FILES = \ - prefs/private/loadprefs.m \ - prefs/private/prefsfile.m \ - prefs/private/saveprefs.m +scripts_prefs_PRIVATE_FCN_FILES = \ + scripts/prefs/private/loadprefs.m \ + scripts/prefs/private/prefsfile.m \ + scripts/prefs/private/saveprefs.m -prefs_FCN_FILES = \ - prefs/addpref.m \ - prefs/getpref.m \ - prefs/ispref.m \ - prefs/prefdir.m \ - prefs/preferences.m \ - prefs/rmpref.m \ - prefs/setpref.m \ - $(prefs_PRIVATE_FCN_FILES) +scripts_prefs_FCN_FILES = \ + scripts/prefs/addpref.m \ + scripts/prefs/getpref.m \ + scripts/prefs/ispref.m \ + scripts/prefs/prefdir.m \ + scripts/prefs/preferences.m \ + scripts/prefs/rmpref.m \ + scripts/prefs/setpref.m \ + $(scripts_prefs_PRIVATE_FCN_FILES) -FCN_FILES += $(prefs_FCN_FILES) +FCN_FILES += $(scripts_prefs_FCN_FILES) -PKG_ADD_FILES += prefs/PKG_ADD +PKG_ADD_FILES += scripts/prefs/PKG_ADD -DIRSTAMP_FILES += prefs/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/prefs/$(octave_dirstamp)
--- a/scripts/set/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/set/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,17 +1,17 @@ -FCN_FILE_DIRS += set +FCN_FILE_DIRS += scripts/set -set_FCN_FILES = \ - set/intersect.m \ - set/ismember.m \ - set/powerset.m \ - set/setdiff.m \ - set/setxor.m \ - set/union.m \ - set/unique.m \ - set/private/validsetargs.m +scripts_set_FCN_FILES = \ + scripts/set/intersect.m \ + scripts/set/ismember.m \ + scripts/set/powerset.m \ + scripts/set/setdiff.m \ + scripts/set/setxor.m \ + scripts/set/union.m \ + scripts/set/unique.m \ + scripts/set/private/validsetargs.m -FCN_FILES += $(set_FCN_FILES) +FCN_FILES += $(scripts_set_FCN_FILES) -PKG_ADD_FILES += set/PKG_ADD +PKG_ADD_FILES += scripts/set/PKG_ADD -DIRSTAMP_FILES += set/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/set/$(octave_dirstamp)
--- a/scripts/signal/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/signal/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,48 +1,48 @@ -FCN_FILE_DIRS += signal +FCN_FILE_DIRS += scripts/signal -signal_PRIVATE_FCN_FILES = \ - signal/private/rectangle_lw.m \ - signal/private/rectangle_sw.m \ - signal/private/triangle_lw.m \ - signal/private/triangle_sw.m +scripts_signal_PRIVATE_FCN_FILES = \ + scripts/signal/private/rectangle_lw.m \ + scripts/signal/private/rectangle_sw.m \ + scripts/signal/private/triangle_lw.m \ + scripts/signal/private/triangle_sw.m -signal_FCN_FILES = \ - signal/arch_fit.m \ - signal/arch_rnd.m \ - signal/arch_test.m \ - signal/arma_rnd.m \ - signal/autoreg_matrix.m \ - signal/bartlett.m \ - signal/blackman.m \ - signal/detrend.m \ - signal/diffpara.m \ - signal/durbinlevinson.m \ - signal/fftconv.m \ - signal/fftfilt.m \ - signal/fftshift.m \ - signal/filter2.m \ - signal/fractdiff.m \ - signal/freqz.m \ - signal/freqz_plot.m \ - signal/hamming.m \ - signal/hanning.m \ - signal/hurst.m \ - signal/ifftshift.m \ - signal/periodogram.m \ - signal/sinc.m \ - signal/sinetone.m \ - signal/sinewave.m \ - signal/spectral_adf.m \ - signal/spectral_xdf.m \ - signal/spencer.m \ - signal/stft.m \ - signal/synthesis.m \ - signal/unwrap.m \ - signal/yulewalker.m \ - $(signal_PRIVATE_FCN_FILES) +scripts_signal_FCN_FILES = \ + scripts/signal/arch_fit.m \ + scripts/signal/arch_rnd.m \ + scripts/signal/arch_test.m \ + scripts/signal/arma_rnd.m \ + scripts/signal/autoreg_matrix.m \ + scripts/signal/bartlett.m \ + scripts/signal/blackman.m \ + scripts/signal/detrend.m \ + scripts/signal/diffpara.m \ + scripts/signal/durbinlevinson.m \ + scripts/signal/fftconv.m \ + scripts/signal/fftfilt.m \ + scripts/signal/fftshift.m \ + scripts/signal/filter2.m \ + scripts/signal/fractdiff.m \ + scripts/signal/freqz.m \ + scripts/signal/freqz_plot.m \ + scripts/signal/hamming.m \ + scripts/signal/hanning.m \ + scripts/signal/hurst.m \ + scripts/signal/ifftshift.m \ + scripts/signal/periodogram.m \ + scripts/signal/sinc.m \ + scripts/signal/sinetone.m \ + scripts/signal/sinewave.m \ + scripts/signal/spectral_adf.m \ + scripts/signal/spectral_xdf.m \ + scripts/signal/spencer.m \ + scripts/signal/stft.m \ + scripts/signal/synthesis.m \ + scripts/signal/unwrap.m \ + scripts/signal/yulewalker.m \ + $(scripts_signal_PRIVATE_FCN_FILES) -FCN_FILES += $(signal_FCN_FILES) +FCN_FILES += $(scripts_signal_FCN_FILES) -PKG_ADD_FILES += signal/PKG_ADD +PKG_ADD_FILES += scripts/signal/PKG_ADD -DIRSTAMP_FILES += signal/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/signal/$(octave_dirstamp)
--- a/scripts/sparse/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/sparse/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,41 +1,41 @@ -FCN_FILE_DIRS += sparse +FCN_FILE_DIRS += scripts/sparse -sparse_PRIVATE_FCN_FILES = \ - sparse/private/__sprand_impl__.m +scripts_sparse_PRIVATE_FCN_FILES = \ + scripts/sparse/private/__sprand_impl__.m -sparse_FCN_FILES = \ - sparse/bicg.m \ - sparse/bicgstab.m \ - sparse/cgs.m \ - sparse/colperm.m \ - sparse/eigs.m \ - sparse/etreeplot.m \ - sparse/gmres.m \ - sparse/gplot.m \ - sparse/ichol.m \ - sparse/ilu.m \ - sparse/nonzeros.m \ - sparse/pcg.m \ - sparse/pcr.m \ - sparse/qmr.m \ - sparse/spaugment.m \ - sparse/spconvert.m \ - sparse/spdiags.m \ - sparse/speye.m \ - sparse/spfun.m \ - sparse/spones.m \ - sparse/sprand.m \ - sparse/sprandn.m \ - sparse/sprandsym.m \ - sparse/spstats.m \ - sparse/spy.m \ - sparse/svds.m \ - sparse/treelayout.m \ - sparse/treeplot.m \ - $(sparse_PRIVATE_FCN_FILES) +scripts_sparse_FCN_FILES = \ + scripts/sparse/bicg.m \ + scripts/sparse/bicgstab.m \ + scripts/sparse/cgs.m \ + scripts/sparse/colperm.m \ + scripts/sparse/eigs.m \ + scripts/sparse/etreeplot.m \ + scripts/sparse/gmres.m \ + scripts/sparse/gplot.m \ + scripts/sparse/ichol.m \ + scripts/sparse/ilu.m \ + scripts/sparse/nonzeros.m \ + scripts/sparse/pcg.m \ + scripts/sparse/pcr.m \ + scripts/sparse/qmr.m \ + scripts/sparse/spaugment.m \ + scripts/sparse/spconvert.m \ + scripts/sparse/spdiags.m \ + scripts/sparse/speye.m \ + scripts/sparse/spfun.m \ + scripts/sparse/spones.m \ + scripts/sparse/sprand.m \ + scripts/sparse/sprandn.m \ + scripts/sparse/sprandsym.m \ + scripts/sparse/spstats.m \ + scripts/sparse/spy.m \ + scripts/sparse/svds.m \ + scripts/sparse/treelayout.m \ + scripts/sparse/treeplot.m \ + $(scripts_sparse_PRIVATE_FCN_FILES) -FCN_FILES += $(sparse_FCN_FILES) +FCN_FILES += $(scripts_sparse_FCN_FILES) -PKG_ADD_FILES += sparse/PKG_ADD +PKG_ADD_FILES += scripts/sparse/PKG_ADD -DIRSTAMP_FILES += sparse/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/sparse/$(octave_dirstamp)
--- a/scripts/specfun/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/specfun/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,27 +1,27 @@ -FCN_FILE_DIRS += specfun +FCN_FILE_DIRS += scripts/specfun -specfun_FCN_FILES = \ - specfun/bessel.m \ - specfun/beta.m \ - specfun/betaln.m \ - specfun/ellipke.m \ - specfun/expint.m \ - specfun/factor.m \ - specfun/factorial.m \ - specfun/isprime.m \ - specfun/lcm.m \ - specfun/legendre.m \ - specfun/nchoosek.m \ - specfun/nthroot.m \ - specfun/perms.m \ - specfun/pow2.m \ - specfun/primes.m \ - specfun/reallog.m \ - specfun/realpow.m \ - specfun/realsqrt.m +scripts_specfun_FCN_FILES = \ + scripts/specfun/bessel.m \ + scripts/specfun/beta.m \ + scripts/specfun/betaln.m \ + scripts/specfun/ellipke.m \ + scripts/specfun/expint.m \ + scripts/specfun/factor.m \ + scripts/specfun/factorial.m \ + scripts/specfun/isprime.m \ + scripts/specfun/lcm.m \ + scripts/specfun/legendre.m \ + scripts/specfun/nchoosek.m \ + scripts/specfun/nthroot.m \ + scripts/specfun/perms.m \ + scripts/specfun/pow2.m \ + scripts/specfun/primes.m \ + scripts/specfun/reallog.m \ + scripts/specfun/realpow.m \ + scripts/specfun/realsqrt.m -FCN_FILES += $(specfun_FCN_FILES) +FCN_FILES += $(scripts_specfun_FCN_FILES) -PKG_ADD_FILES += specfun/PKG_ADD +PKG_ADD_FILES += scripts/specfun/PKG_ADD -DIRSTAMP_FILES += specfun/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/specfun/$(octave_dirstamp)
--- a/scripts/special-matrix/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/special-matrix/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,20 +1,20 @@ -FCN_FILE_DIRS += special-matrix +FCN_FILE_DIRS += scripts/special-matrix -special_matrix_FCN_FILES = \ - special-matrix/gallery.m \ - special-matrix/hadamard.m \ - special-matrix/hankel.m \ - special-matrix/hilb.m \ - special-matrix/invhilb.m \ - special-matrix/magic.m \ - special-matrix/pascal.m \ - special-matrix/rosser.m \ - special-matrix/toeplitz.m \ - special-matrix/vander.m \ - special-matrix/wilkinson.m +scripts_special_matrix_FCN_FILES = \ + scripts/special-matrix/gallery.m \ + scripts/special-matrix/hadamard.m \ + scripts/special-matrix/hankel.m \ + scripts/special-matrix/hilb.m \ + scripts/special-matrix/invhilb.m \ + scripts/special-matrix/magic.m \ + scripts/special-matrix/pascal.m \ + scripts/special-matrix/rosser.m \ + scripts/special-matrix/toeplitz.m \ + scripts/special-matrix/vander.m \ + scripts/special-matrix/wilkinson.m -FCN_FILES += $(special_matrix_FCN_FILES) +FCN_FILES += $(scripts_special_matrix_FCN_FILES) -PKG_ADD_FILES += special-matrix/PKG_ADD +PKG_ADD_FILES += scripts/special-matrix/PKG_ADD -DIRSTAMP_FILES += special-matrix/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/special-matrix/$(octave_dirstamp)
--- a/scripts/startup/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/startup/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,13 +1,13 @@ -FCN_FILE_DIRS += startup +FCN_FILE_DIRS += scripts/startup -startup_FCN_FILES = \ - startup/__finish__.m +scripts_startup_FCN_FILES = \ + scripts/startup/__finish__.m -LOCAL_STARTUP_FILE_SRC = startup/local-rcfile +LOCAL_STARTUP_FILE_SRC = scripts/startup/local-rcfile -SYSTEM_STARTUP_FILE_SRC = startup/main-rcfile +SYSTEM_STARTUP_FILE_SRC = scripts/startup/main-rcfile -SYSTEM_INPUTRC_FILE_SRC = startup/inputrc +SYSTEM_INPUTRC_FILE_SRC = scripts/startup/inputrc STARTUP_FILE_SRC = \ $(LOCAL_STARTUP_FILE_SRC) \ @@ -15,11 +15,11 @@ $(SYSTEM_INPUTRC_FILE_SRC) FCN_FILES += \ - $(startup_FCN_FILES) + $(scripts_startup_FCN_FILES) EXTRA_DIST += \ $(STARTUP_FILE_SRC) -PKG_ADD_FILES += startup/PKG_ADD +PKG_ADD_FILES += scripts/startup/PKG_ADD -DIRSTAMP_FILES += startup/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/startup/$(octave_dirstamp)
--- a/scripts/statistics/base/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/statistics/base/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,43 +1,43 @@ -FCN_FILE_DIRS += statistics/base +FCN_FILE_DIRS += scripts/statistics/base -statistics_base_FCN_FILES = \ - statistics/base/center.m \ - statistics/base/cloglog.m \ - statistics/base/corr.m \ - statistics/base/cov.m \ - statistics/base/gls.m \ - statistics/base/histc.m \ - statistics/base/iqr.m \ - statistics/base/kendall.m \ - statistics/base/kurtosis.m \ - statistics/base/logit.m \ - statistics/base/lscov.m \ - statistics/base/mahalanobis.m \ - statistics/base/mean.m \ - statistics/base/meansq.m \ - statistics/base/median.m \ - statistics/base/mode.m \ - statistics/base/moment.m \ - statistics/base/ols.m \ - statistics/base/ppplot.m \ - statistics/base/prctile.m \ - statistics/base/probit.m \ - statistics/base/qqplot.m \ - statistics/base/quantile.m \ - statistics/base/range.m \ - statistics/base/ranks.m \ - statistics/base/run_count.m \ - statistics/base/runlength.m \ - statistics/base/skewness.m \ - statistics/base/spearman.m \ - statistics/base/statistics.m \ - statistics/base/std.m \ - statistics/base/table.m \ - statistics/base/var.m \ - statistics/base/zscore.m +scripts_statistics_base_FCN_FILES = \ + scripts/statistics/base/center.m \ + scripts/statistics/base/cloglog.m \ + scripts/statistics/base/corr.m \ + scripts/statistics/base/cov.m \ + scripts/statistics/base/gls.m \ + scripts/statistics/base/histc.m \ + scripts/statistics/base/iqr.m \ + scripts/statistics/base/kendall.m \ + scripts/statistics/base/kurtosis.m \ + scripts/statistics/base/logit.m \ + scripts/statistics/base/lscov.m \ + scripts/statistics/base/mahalanobis.m \ + scripts/statistics/base/mean.m \ + scripts/statistics/base/meansq.m \ + scripts/statistics/base/median.m \ + scripts/statistics/base/mode.m \ + scripts/statistics/base/moment.m \ + scripts/statistics/base/ols.m \ + scripts/statistics/base/ppplot.m \ + scripts/statistics/base/prctile.m \ + scripts/statistics/base/probit.m \ + scripts/statistics/base/qqplot.m \ + scripts/statistics/base/quantile.m \ + scripts/statistics/base/range.m \ + scripts/statistics/base/ranks.m \ + scripts/statistics/base/run_count.m \ + scripts/statistics/base/runlength.m \ + scripts/statistics/base/skewness.m \ + scripts/statistics/base/spearman.m \ + scripts/statistics/base/statistics.m \ + scripts/statistics/base/std.m \ + scripts/statistics/base/table.m \ + scripts/statistics/base/var.m \ + scripts/statistics/base/zscore.m -FCN_FILES += $(statistics_base_FCN_FILES) +FCN_FILES += $(scripts_statistics_base_FCN_FILES) -PKG_ADD_FILES += statistics/base/PKG_ADD +PKG_ADD_FILES += scripts/statistics/base/PKG_ADD -DIRSTAMP_FILES += statistics/base/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/statistics/base/$(octave_dirstamp)
--- a/scripts/statistics/distributions/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/statistics/distributions/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,99 +1,99 @@ -FCN_FILE_DIRS += statistics/distributions +FCN_FILE_DIRS += scripts/statistics/distributions -statistics_distributions_FCN_FILES = \ - statistics/distributions/betacdf.m \ - statistics/distributions/betainv.m \ - statistics/distributions/betapdf.m \ - statistics/distributions/betarnd.m \ - statistics/distributions/binocdf.m \ - statistics/distributions/binoinv.m \ - statistics/distributions/binopdf.m \ - statistics/distributions/binornd.m \ - statistics/distributions/cauchy_cdf.m \ - statistics/distributions/cauchy_inv.m \ - statistics/distributions/cauchy_pdf.m \ - statistics/distributions/cauchy_rnd.m \ - statistics/distributions/chi2cdf.m \ - statistics/distributions/chi2inv.m \ - statistics/distributions/chi2pdf.m \ - statistics/distributions/chi2rnd.m \ - statistics/distributions/discrete_cdf.m \ - statistics/distributions/discrete_inv.m \ - statistics/distributions/discrete_pdf.m \ - statistics/distributions/discrete_rnd.m \ - statistics/distributions/empirical_cdf.m \ - statistics/distributions/empirical_inv.m \ - statistics/distributions/empirical_pdf.m \ - statistics/distributions/empirical_rnd.m \ - statistics/distributions/expcdf.m \ - statistics/distributions/expinv.m \ - statistics/distributions/exppdf.m \ - statistics/distributions/exprnd.m \ - statistics/distributions/fcdf.m \ - statistics/distributions/finv.m \ - statistics/distributions/fpdf.m \ - statistics/distributions/frnd.m \ - statistics/distributions/gamcdf.m \ - statistics/distributions/gaminv.m \ - statistics/distributions/gampdf.m \ - statistics/distributions/gamrnd.m \ - statistics/distributions/geocdf.m \ - statistics/distributions/geoinv.m \ - statistics/distributions/geopdf.m \ - statistics/distributions/geornd.m \ - statistics/distributions/hygecdf.m \ - statistics/distributions/hygeinv.m \ - statistics/distributions/hygepdf.m \ - statistics/distributions/hygernd.m \ - statistics/distributions/kolmogorov_smirnov_cdf.m \ - statistics/distributions/laplace_cdf.m \ - statistics/distributions/laplace_inv.m \ - statistics/distributions/laplace_pdf.m \ - statistics/distributions/laplace_rnd.m \ - statistics/distributions/logistic_cdf.m \ - statistics/distributions/logistic_inv.m \ - statistics/distributions/logistic_pdf.m \ - statistics/distributions/logistic_rnd.m \ - statistics/distributions/logncdf.m \ - statistics/distributions/logninv.m \ - statistics/distributions/lognpdf.m \ - statistics/distributions/lognrnd.m \ - statistics/distributions/nbincdf.m \ - statistics/distributions/nbininv.m \ - statistics/distributions/nbinpdf.m \ - statistics/distributions/nbinrnd.m \ - statistics/distributions/normcdf.m \ - statistics/distributions/norminv.m \ - statistics/distributions/normpdf.m \ - statistics/distributions/normrnd.m \ - statistics/distributions/poisscdf.m \ - statistics/distributions/poissinv.m \ - statistics/distributions/poisspdf.m \ - statistics/distributions/poissrnd.m \ - statistics/distributions/stdnormal_cdf.m \ - statistics/distributions/stdnormal_inv.m \ - statistics/distributions/stdnormal_pdf.m \ - statistics/distributions/stdnormal_rnd.m \ - statistics/distributions/tcdf.m \ - statistics/distributions/tinv.m \ - statistics/distributions/tpdf.m \ - statistics/distributions/trnd.m \ - statistics/distributions/unidrnd.m \ - statistics/distributions/unidcdf.m \ - statistics/distributions/unidinv.m \ - statistics/distributions/unidpdf.m \ - statistics/distributions/unifrnd.m \ - statistics/distributions/unifcdf.m \ - statistics/distributions/unifinv.m \ - statistics/distributions/unifpdf.m \ - statistics/distributions/wblcdf.m \ - statistics/distributions/wblinv.m \ - statistics/distributions/wblpdf.m \ - statistics/distributions/wblrnd.m \ - statistics/distributions/wienrnd.m +scripts_statistics_distributions_FCN_FILES = \ + scripts/statistics/distributions/betacdf.m \ + scripts/statistics/distributions/betainv.m \ + scripts/statistics/distributions/betapdf.m \ + scripts/statistics/distributions/betarnd.m \ + scripts/statistics/distributions/binocdf.m \ + scripts/statistics/distributions/binoinv.m \ + scripts/statistics/distributions/binopdf.m \ + scripts/statistics/distributions/binornd.m \ + scripts/statistics/distributions/cauchy_cdf.m \ + scripts/statistics/distributions/cauchy_inv.m \ + scripts/statistics/distributions/cauchy_pdf.m \ + scripts/statistics/distributions/cauchy_rnd.m \ + scripts/statistics/distributions/chi2cdf.m \ + scripts/statistics/distributions/chi2inv.m \ + scripts/statistics/distributions/chi2pdf.m \ + scripts/statistics/distributions/chi2rnd.m \ + scripts/statistics/distributions/discrete_cdf.m \ + scripts/statistics/distributions/discrete_inv.m \ + scripts/statistics/distributions/discrete_pdf.m \ + scripts/statistics/distributions/discrete_rnd.m \ + scripts/statistics/distributions/empirical_cdf.m \ + scripts/statistics/distributions/empirical_inv.m \ + scripts/statistics/distributions/empirical_pdf.m \ + scripts/statistics/distributions/empirical_rnd.m \ + scripts/statistics/distributions/expcdf.m \ + scripts/statistics/distributions/expinv.m \ + scripts/statistics/distributions/exppdf.m \ + scripts/statistics/distributions/exprnd.m \ + scripts/statistics/distributions/fcdf.m \ + scripts/statistics/distributions/finv.m \ + scripts/statistics/distributions/fpdf.m \ + scripts/statistics/distributions/frnd.m \ + scripts/statistics/distributions/gamcdf.m \ + scripts/statistics/distributions/gaminv.m \ + scripts/statistics/distributions/gampdf.m \ + scripts/statistics/distributions/gamrnd.m \ + scripts/statistics/distributions/geocdf.m \ + scripts/statistics/distributions/geoinv.m \ + scripts/statistics/distributions/geopdf.m \ + scripts/statistics/distributions/geornd.m \ + scripts/statistics/distributions/hygecdf.m \ + scripts/statistics/distributions/hygeinv.m \ + scripts/statistics/distributions/hygepdf.m \ + scripts/statistics/distributions/hygernd.m \ + scripts/statistics/distributions/kolmogorov_smirnov_cdf.m \ + scripts/statistics/distributions/laplace_cdf.m \ + scripts/statistics/distributions/laplace_inv.m \ + scripts/statistics/distributions/laplace_pdf.m \ + scripts/statistics/distributions/laplace_rnd.m \ + scripts/statistics/distributions/logistic_cdf.m \ + scripts/statistics/distributions/logistic_inv.m \ + scripts/statistics/distributions/logistic_pdf.m \ + scripts/statistics/distributions/logistic_rnd.m \ + scripts/statistics/distributions/logncdf.m \ + scripts/statistics/distributions/logninv.m \ + scripts/statistics/distributions/lognpdf.m \ + scripts/statistics/distributions/lognrnd.m \ + scripts/statistics/distributions/nbincdf.m \ + scripts/statistics/distributions/nbininv.m \ + scripts/statistics/distributions/nbinpdf.m \ + scripts/statistics/distributions/nbinrnd.m \ + scripts/statistics/distributions/normcdf.m \ + scripts/statistics/distributions/norminv.m \ + scripts/statistics/distributions/normpdf.m \ + scripts/statistics/distributions/normrnd.m \ + scripts/statistics/distributions/poisscdf.m \ + scripts/statistics/distributions/poissinv.m \ + scripts/statistics/distributions/poisspdf.m \ + scripts/statistics/distributions/poissrnd.m \ + scripts/statistics/distributions/stdnormal_cdf.m \ + scripts/statistics/distributions/stdnormal_inv.m \ + scripts/statistics/distributions/stdnormal_pdf.m \ + scripts/statistics/distributions/stdnormal_rnd.m \ + scripts/statistics/distributions/tcdf.m \ + scripts/statistics/distributions/tinv.m \ + scripts/statistics/distributions/tpdf.m \ + scripts/statistics/distributions/trnd.m \ + scripts/statistics/distributions/unidrnd.m \ + scripts/statistics/distributions/unidcdf.m \ + scripts/statistics/distributions/unidinv.m \ + scripts/statistics/distributions/unidpdf.m \ + scripts/statistics/distributions/unifrnd.m \ + scripts/statistics/distributions/unifcdf.m \ + scripts/statistics/distributions/unifinv.m \ + scripts/statistics/distributions/unifpdf.m \ + scripts/statistics/distributions/wblcdf.m \ + scripts/statistics/distributions/wblinv.m \ + scripts/statistics/distributions/wblpdf.m \ + scripts/statistics/distributions/wblrnd.m \ + scripts/statistics/distributions/wienrnd.m -FCN_FILES += $(statistics_distributions_FCN_FILES) +FCN_FILES += $(scripts_statistics_distributions_FCN_FILES) -PKG_ADD_FILES += statistics/distributions/PKG_ADD +PKG_ADD_FILES += scripts/statistics/distributions/PKG_ADD -DIRSTAMP_FILES += statistics/distributions/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/statistics/distributions/$(octave_dirstamp)
--- a/scripts/statistics/models/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/statistics/models/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,15 +1,15 @@ -FCN_FILE_DIRS += statistics/models +FCN_FILE_DIRS += scripts/statistics/models -statistics_models_PRIVATE_FCN_FILES = \ - statistics/models/private/logistic_regression_derivatives.m \ - statistics/models/private/logistic_regression_likelihood.m +scripts_statistics_models_PRIVATE_FCN_FILES = \ + scripts/statistics/models/private/logistic_regression_derivatives.m \ + scripts/statistics/models/private/logistic_regression_likelihood.m -statistics_models_FCN_FILES = \ - statistics/models/logistic_regression.m \ - $(statistics_models_PRIVATE_FCN_FILES) +scripts_statistics_models_FCN_FILES = \ + scripts/statistics/models/logistic_regression.m \ + $(scripts_statistics_models_PRIVATE_FCN_FILES) -FCN_FILES += $(statistics_models_FCN_FILES) +FCN_FILES += $(scripts_statistics_models_FCN_FILES) -PKG_ADD_FILES += statistics/models/PKG_ADD +PKG_ADD_FILES += scripts/statistics/models/PKG_ADD -DIRSTAMP_FILES += statistics/models/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/statistics/models/$(octave_dirstamp)
--- a/scripts/statistics/tests/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/statistics/tests/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,34 +1,34 @@ -FCN_FILE_DIRS += statistics/tests +FCN_FILE_DIRS += scripts/statistics/tests -statistics_tests_FCN_FILES = \ - statistics/tests/anova.m \ - statistics/tests/bartlett_test.m \ - statistics/tests/chisquare_test_homogeneity.m \ - statistics/tests/chisquare_test_independence.m \ - statistics/tests/cor_test.m \ - statistics/tests/f_test_regression.m \ - statistics/tests/hotelling_test.m \ - statistics/tests/hotelling_test_2.m \ - statistics/tests/kolmogorov_smirnov_test.m \ - statistics/tests/kolmogorov_smirnov_test_2.m \ - statistics/tests/kruskal_wallis_test.m \ - statistics/tests/manova.m \ - statistics/tests/mcnemar_test.m \ - statistics/tests/prop_test_2.m \ - statistics/tests/run_test.m \ - statistics/tests/sign_test.m \ - statistics/tests/t_test.m \ - statistics/tests/t_test_2.m \ - statistics/tests/t_test_regression.m \ - statistics/tests/u_test.m \ - statistics/tests/var_test.m \ - statistics/tests/welch_test.m \ - statistics/tests/wilcoxon_test.m \ - statistics/tests/z_test.m \ - statistics/tests/z_test_2.m +scripts_statistics_tests_FCN_FILES = \ + scripts/statistics/tests/anova.m \ + scripts/statistics/tests/bartlett_test.m \ + scripts/statistics/tests/chisquare_test_homogeneity.m \ + scripts/statistics/tests/chisquare_test_independence.m \ + scripts/statistics/tests/cor_test.m \ + scripts/statistics/tests/f_test_regression.m \ + scripts/statistics/tests/hotelling_test.m \ + scripts/statistics/tests/hotelling_test_2.m \ + scripts/statistics/tests/kolmogorov_smirnov_test.m \ + scripts/statistics/tests/kolmogorov_smirnov_test_2.m \ + scripts/statistics/tests/kruskal_wallis_test.m \ + scripts/statistics/tests/manova.m \ + scripts/statistics/tests/mcnemar_test.m \ + scripts/statistics/tests/prop_test_2.m \ + scripts/statistics/tests/run_test.m \ + scripts/statistics/tests/sign_test.m \ + scripts/statistics/tests/t_test.m \ + scripts/statistics/tests/t_test_2.m \ + scripts/statistics/tests/t_test_regression.m \ + scripts/statistics/tests/u_test.m \ + scripts/statistics/tests/var_test.m \ + scripts/statistics/tests/welch_test.m \ + scripts/statistics/tests/wilcoxon_test.m \ + scripts/statistics/tests/z_test.m \ + scripts/statistics/tests/z_test_2.m -FCN_FILES += $(statistics_tests_FCN_FILES) +FCN_FILES += $(scripts_statistics_tests_FCN_FILES) -PKG_ADD_FILES += statistics/tests/PKG_ADD +PKG_ADD_FILES += scripts/statistics/tests/PKG_ADD -DIRSTAMP_FILES += statistics/tests/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/statistics/tests/$(octave_dirstamp)
--- a/scripts/strings/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/strings/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,39 +1,39 @@ -FCN_FILE_DIRS += strings +FCN_FILE_DIRS += scripts/strings -strings_FCN_FILES = \ - strings/base2dec.m \ - strings/bin2dec.m \ - strings/blanks.m \ - strings/cstrcat.m \ - strings/deblank.m \ - strings/dec2base.m \ - strings/dec2bin.m \ - strings/dec2hex.m \ - strings/findstr.m \ - strings/hex2dec.m \ - strings/index.m \ - strings/isletter.m \ - strings/isstrprop.m \ - strings/mat2str.m \ - strings/ostrsplit.m \ - strings/regexptranslate.m \ - strings/rindex.m \ - strings/str2num.m \ - strings/strcat.m \ - strings/strchr.m \ - strings/strjoin.m \ - strings/strjust.m \ - strings/strmatch.m \ - strings/strsplit.m \ - strings/strtok.m \ - strings/strtrim.m \ - strings/strtrunc.m \ - strings/substr.m \ - strings/untabify.m \ - strings/validatestring.m +scripts_strings_FCN_FILES = \ + scripts/strings/base2dec.m \ + scripts/strings/bin2dec.m \ + scripts/strings/blanks.m \ + scripts/strings/cstrcat.m \ + scripts/strings/deblank.m \ + scripts/strings/dec2base.m \ + scripts/strings/dec2bin.m \ + scripts/strings/dec2hex.m \ + scripts/strings/findstr.m \ + scripts/strings/hex2dec.m \ + scripts/strings/index.m \ + scripts/strings/isletter.m \ + scripts/strings/isstrprop.m \ + scripts/strings/mat2str.m \ + scripts/strings/ostrsplit.m \ + scripts/strings/regexptranslate.m \ + scripts/strings/rindex.m \ + scripts/strings/str2num.m \ + scripts/strings/strcat.m \ + scripts/strings/strchr.m \ + scripts/strings/strjoin.m \ + scripts/strings/strjust.m \ + scripts/strings/strmatch.m \ + scripts/strings/strsplit.m \ + scripts/strings/strtok.m \ + scripts/strings/strtrim.m \ + scripts/strings/strtrunc.m \ + scripts/strings/substr.m \ + scripts/strings/untabify.m \ + scripts/strings/validatestring.m -FCN_FILES += $(strings_FCN_FILES) +FCN_FILES += $(scripts_strings_FCN_FILES) -PKG_ADD_FILES += strings/PKG_ADD +PKG_ADD_FILES += scripts/strings/PKG_ADD -DIRSTAMP_FILES += strings/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/strings/$(octave_dirstamp)
--- a/scripts/testfun/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/testfun/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,21 +1,21 @@ -FCN_FILE_DIRS += testfun +FCN_FILE_DIRS += scripts/testfun -testfun_FCN_FILES = \ - testfun/__have_feature__.m \ - testfun/__printf_assert__.m \ - testfun/__prog_output_assert__.m \ - testfun/__run_test_suite__.m \ - testfun/assert.m \ - testfun/demo.m \ - testfun/example.m \ - testfun/fail.m \ - testfun/rundemos.m \ - testfun/runtests.m \ - testfun/speed.m \ - testfun/test.m +scripts_testfun_FCN_FILES = \ + scripts/testfun/__have_feature__.m \ + scripts/testfun/__printf_assert__.m \ + scripts/testfun/__prog_output_assert__.m \ + scripts/testfun/__run_test_suite__.m \ + scripts/testfun/assert.m \ + scripts/testfun/demo.m \ + scripts/testfun/example.m \ + scripts/testfun/fail.m \ + scripts/testfun/rundemos.m \ + scripts/testfun/runtests.m \ + scripts/testfun/speed.m \ + scripts/testfun/test.m -FCN_FILES += $(testfun_FCN_FILES) +FCN_FILES += $(scripts_testfun_FCN_FILES) -PKG_ADD_FILES += testfun/PKG_ADD +PKG_ADD_FILES += scripts/testfun/PKG_ADD -DIRSTAMP_FILES += testfun/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/testfun/$(octave_dirstamp)
--- a/scripts/time/module.mk Fri Jul 10 13:28:33 2015 -0400 +++ b/scripts/time/module.mk Fri Jul 10 14:40:47 2015 -0400 @@ -1,23 +1,23 @@ -FCN_FILE_DIRS += time +FCN_FILE_DIRS += scripts/time -time_FCN_FILES = \ - time/addtodate.m \ - time/asctime.m \ - time/calendar.m \ - time/clock.m \ - time/ctime.m \ - time/date.m \ - time/datenum.m \ - time/datestr.m \ - time/datevec.m \ - time/eomday.m \ - time/etime.m \ - time/is_leap_year.m \ - time/now.m \ - time/weekday.m +scripts_time_FCN_FILES = \ + scripts/time/addtodate.m \ + scripts/time/asctime.m \ + scripts/time/calendar.m \ + scripts/time/clock.m \ + scripts/time/ctime.m \ + scripts/time/date.m \ + scripts/time/datenum.m \ + scripts/time/datestr.m \ + scripts/time/datevec.m \ + scripts/time/eomday.m \ + scripts/time/etime.m \ + scripts/time/is_leap_year.m \ + scripts/time/now.m \ + scripts/time/weekday.m -FCN_FILES += $(time_FCN_FILES) +FCN_FILES += $(scripts_time_FCN_FILES) -PKG_ADD_FILES += time/PKG_ADD +PKG_ADD_FILES += scripts/time/PKG_ADD -DIRSTAMP_FILES += time/$(octave_dirstamp) +DIRSTAMP_FILES += scripts/time/$(octave_dirstamp)