Mercurial > forge

changeset 2397:671181dd32f5 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First cut and packaging and test build with configure;make. Works partially, with some broken packages. extras/nonfree to be converted
author adb014
date Wed, 23 Aug 2006 19:38:44 +0000
parents 9cbef6556ffd
children 53ef0a775385
files admin/run_forge configure.base main/Makefile main/audio/src/Makeconf.add main/audio/src/Makeconf.base main/audio/src/Makeconf.in main/audio/src/configure.add main/audio/src/configure.base main/comm/Makefile main/comm/doc/Makefile main/comm/src/.cvsignore main/comm/src/Makeconf.base main/comm/src/Makeconf.in main/comm/src/autogen.sh main/fixed/Makefile main/fixed/doc/Makeconf.add main/fixed/doc/Makefile main/fixed/doc/configure.add main/fixed/examples/Makefile main/fixed/examples/ffft.cc main/fixed/examples/ffft.h main/fixed/inst/.cvsignore main/fixed/src/Makeconf.add main/fixed/src/Makeconf.base main/fixed/src/Makeconf.in main/fixed/src/Makefile main/fixed/src/autogen.sh main/fixed/src/configure.add main/fixed/src/configure.base main/release.sh packages/.cvsignore packages/.octaverc packages/Makefile packages/README pkg.mk
diffstat 35 files changed, 160 insertions(+), 853 deletions(-) [+]
line wrap: on
line diff
--- a/admin/run_forge	Tue Aug 22 21:04:47 2006 +0000
+++ b/admin/run_forge	Wed Aug 23 19:38:44 2006 +0000
@@ -24,7 +24,7 @@
 # on the system.  We may also want to pick up the OCTAVE_EXEC_PATH if
 # there is one.
 EXECPATH="$PATH:"
-for f in FIXES main/* extra/* nonfree/*; do
+for f in tmp/* main/* extra/* nonfree/*; do
     # exclude CVS directories, only include directories, skip NOINSTALL
     case "$f" in
       */CVS) ;;
--- a/configure.base	Tue Aug 22 21:04:47 2006 +0000
+++ b/configure.base	Wed Aug 23 19:38:44 2006 +0000
@@ -229,34 +229,6 @@
 [int F77_FUNC (hello, HELLO) (const int &n);],,
 [MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"])
 
-dnl
-dnl Check if octave still uses SLList.h
-dnl
-TRY_MKOCTFILE([for SLList.h],[#include <octave/SLList.h>],
-[MKOCTFILE="$MKOCTFILE -DHAVE_SLLIST_H"],)
-
-dnl
-dnl Check if octave has lo_ieee_nan_value
-dnl
-TRY_MKOCTFILE([for lo_ieee_nan_value],
-[ #include <octave/lo-ieee.h>
-int test(void) { lo_ieee_nan_value(); }],,
-[MKOCTFILE="$MKOCTFILE -DUSE_OCTAVE_NAN"])
-
-dnl
-dnl Check if octave is needs octave_idx_type
-dnl
-TRY_MKOCTFILE([for octave_idx_type],
-[#include <octave/oct-types.h>
-octave_idx_type test(void) { octave_idx_type idx = 1; return idx; }],,
-[MKOCTFILE="$MKOCTFILE -Doctave_idx_type=int"])
-
-dnl
-dnl Check if octave uses quit.h
-dnl
-TRY_MKOCTFILE([for quit.h],[#include <octave/quit.h>],,
-[MKOCTFILE="$MKOCTFILE -DNEED_OCTAVE_QUIT"])
-
 dnl **********************************************************
 
 dnl Evaluate an expression in octave
@@ -326,171 +298,6 @@
     ;;
 esac
 
-dnl Things needed to link to X11 programs
-dnl defines X_CFLAGS, X_LIBS
-AC_SUBST(DEFHAVE_X)
-AC_SUBST(X_LIBS)
-AC_SUBST(X_CFLAGS)
-AC_PATH_XTRA
-if test "$no_x" = yes ; then
-	DEFHAVE_X=
-	XSTATUS="no (plot/g{input,text,zoom,rab} will not work)"
-else
-	DEFHAVE_X="HAVE_X=1"
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-	XSTATUS="yes"
-fi
-
-OCTAVE_CHECK_EXIST(autoload,[
-	HAVE_AUTOLOAD="yes"
-	OCTLINK=.octlink
-	MKOCTLINK=$TOPDIR/admin/octlink.sh
-],[
-	HAVE_AUTOLOAD="no"
-	OCTLINK=.oct
-	MKOCTLINK=$LN_S
-])
-AC_SUBST(HAVE_AUTOLOAD)
-AC_SUBST(OCTLINK)
-AC_SUBST(MKOCTLINK)
-
-OCTAVE_CHECK_EXIST(do_fortran_indexing,
-	[HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"],)
-AC_SUBST(HAVE_DO_FORTRAN_INDEXING)
-
-OCTAVE_CHECK_EXIST(propagate_empty_matrices,
-	[PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"],)
-AC_SUBST(HAVE_PROPAGATE_EMPTY_MATRICES)
-
-OCTAVE_CHECK_EXIST(ok_to_lose_imaginary_part,
-  [HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"],)
-AC_SUBST(HAVE_OK_TO_LOSE_IMAGINARY_PART)
-
-dnl Test for N-dimensional Arrays
-TRY_MKOCTFILE([for N-dim arrays],
-[#include <octave/dim-vector.h>],
-[HAVE_ND_ARRAYS="-DHAVE_ND_ARRAYS"],)
-AC_SUBST(HAVE_ND_ARRAYS)
-
-OCTAVE_CHECK_EXIST(class,[TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"],)
-AC_SUBST(TYPEID_HAS_CLASS)
-
-dnl Test for load/save functions in class
-TRY_MKOCTFILE([for load/save functions in class],
-[#include <octave/ov-scalar.h>
-int main (void) { octave_scalar a; a.load_ascii(std::cin); }],
-[CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],)
-AC_SUBST(CLASS_HAS_LOAD_SAVE)
-
-TRY_MKOCTFILE([for Octave_map indexing],
-[#include <octave/oct-map.h>
-int main(void) { Octave_map a; a[["key"]]; }],
-[HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],)
-AC_SUBST(HAVE_OCTAVE_MAP_INDEX)
-
-TRY_MKOCTFILE([for old Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=concat(a,a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OLD_OCTAVE_CONCAT"],)
-
-TRY_MKOCTFILE([for Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=a.concat(a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OCTAVE_CONCAT"],)
-AC_SUBST(HAVE_OCTAVE_CONCAT)
-
-TRY_MKOCTFILE([for swap_8_bytes],
-[#include <sys/types.h>
-#include <octave/config.h>
-#include <octave/byte-swap.h>
-int main(void) {long long a = 1; swap_8_bytes (&a,1);}],,
-[HAVE_SWAP_BYTES="-DHAVE_SWAP_BYTES"])
-AC_SUBST(HAVE_SWAP_BYTES)
-
-TRY_MKOCTFILE([for op_uplus],
-[#include <octave/config.h>
-#include <octave/ov.h>
-int main(void) {int i = octave_value::op_uplus;}],
-[HAVE_OCTAVE_UPLUS="-DHAVE_OCTAVE_UPLUS"],)
-AC_SUBST(HAVE_OCTAVE_UPLUS)
-
-dnl Test for the makeinfo program
-AC_CHECK_PROG(MAKEINFO,makeinfo,makeinfo)
-if [ test -n "$MAKEINFO" ]; then
-	dnl Check whether the makeinfo command accepts the 
-	dnl "--no-split" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for makeinfo --no-split])
-	ac_try="$MAKEINFO --no-split conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		MAKEINFO="$MAKEINFO --no-split"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
-
-dnl Test for the texi2dvi program
-AC_CHECK_PROG(TEXI2DVI,texi2dvi,texi2dvi)
-if [ test -n "$TEXI2DVI" ]; then
-	dnl Check whether the texi2dvi command accepts the 
-	dnl "--clean" option
-	cat > conftest.texi <<EOF
-\input texinfo
-@bye
-EOF
-	AC_MSG_CHECKING([that texi2dvi runs])
-	ac_try="$TEXI2DVI conftest.texi > /dev/null"
-	if AC_TRY_EVAL(ac_try) ; then
-	    AC_MSG_RESULT(yes)
-	    AC_MSG_CHECKING([for texi2dvi --clean])
-	    ac_try="$TEXI2DVI --clean conftest.texi > /dev/null"
-	    if AC_TRY_EVAL(ac_try) ; then
-		TEXI2DVI="$TEXI2DVI --clean"
-		AC_MSG_RESULT(yes)
-	    else
-		AC_MSG_RESULT(no)
-	    fi
-	else
-	    TEXI2DVI=""
-	    AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
-
-dnl Test for the texi2html program
-AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
-if [ test -n "$TEXI2HTML" ]; then
-	STATUS="yes"
-	dnl Check whether the texi2html command accepts the 
-	dnl "-split_chapter -number" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for texi2html --clean])
-	ac_try="$TEXI2HTML -split_chapter -number conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		TEXI2HTML="$TEXI2HTML -split_chapter -number"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-        dnl TeTex 3.0 on Suse is leaving a conftest directory
-	rm -rf conftest
-fi
-
-dnl Test for the dvipdf program
-AC_CHECK_PROG(DVIPDF,dvipdf,dvipdf)
-
-dnl Test for the dvips program
-AC_CHECK_PROG(DVIPS,dvips,dvips)
-
-MKDOC=$TOPDIR/admin/mkdoc
-AC_SUBST(MKDOC)
-
-MKTEXI=$TOPDIR/admin/mktexi
-AC_SUBST(MKTEXI)
-
 CONFIGURE_OUTPUTS="Makeconf octinst.sh"
 STATUS_MSG="
 octave commands will install into the following directories:
--- a/main/Makefile	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -1,28 +1,28 @@
 sinclude ../Makeconf
+sinclude ../pkg.mk
+
+ifeq ($(PKGDIR),)
+PKGDIR = ../packages
+endif
 
 # Determine which subdirectories are to be installed.  Of those, determine
 # which have their own Makefile.
 SUBMAKEDIRS = $(dir $(wildcard */Makefile))
 NOINSTALLDIRS = $(dir $(wildcard */NOINSTALL))
 BUILDDIRS = $(filter-out $(NOINSTALLDIRS), $(SUBMAKEDIRS))
-INSTALLDIRS = $(filter-out CVS/ $(NOINSTALLDIRS), $(dir $(wildcard */.)))
+INSTALLDIRS = $(filter-out $BUILDDIRS, $(filter-out CVS/ $(NOINSTALLDIRS), $(dir $(wildcard */.))))
 
 .PHONY: all install clean distclean $(SUBMAKEDIRS)
 
 ifdef OCTAVE_FORGE
-all: $(BUILDDIRS)
+all: $(patsubst %,dopkg/%,$(BUILDDIRS)) $(patsubst %,dopkg2/%,$(INSTALLDIRS))
 
-install: $(BUILDDIRS)
-	@test -z "$(NOINSTALLDIRS)" || echo skipping $(NOINSTALLDIRS)
-ifeq ($(INSTALLDIRS),)
-	@echo installing no packages
-else
-	@for f in $(INSTALLDIRS) ; do \
-            echo installing $$f... ; \
-            ../$(INSTALLOCT) $$f $(DESTDIR)$(MPATH)/$$f \
-	    $(DESTDIR)$(OPATH) $(DESTDIR)$(XPATH) ; \
-        done
-endif
+dopkg/%:
+	$(MAKE) PKGDIR=$(PKGDIR) -C $(pkg) pkg/$(pkg)
+
+dopkg2/%:
+	ver=`grep "Version:" $(pkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
+	tar -zcf $(PKGDIR)/$(pkg)-$$ver.tar.gz $(REAL_PKG_FILES)
 
 else
 all:
@@ -31,8 +31,6 @@
 
 clean: $(SUBMAKEDIRS)
 
-dist: $(SUBMAKEDIRS)
-
 # Propogate make to the subdirectory if the goal is a valid target
 # in the subdirectory Makefile.
 $(SUBMAKEDIRS):
--- a/main/audio/src/Makeconf.add	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-@DEFHAVE_LINUX_SOUNDCARD@
--- a/main/audio/src/Makeconf.base	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-
-## Makeconf is automatically generated from Makeconf.base and Makeconf.add
-## in the various subdirectories.  To regenerate, use ./autogen.sh to
-## create a new ./Makeconf.in, then use ./configure to generate a new
-## Makeconf.
-
-OCTAVE_FORGE = 1
-
-SHELL = @SHELL@
-
-canonical_host_type = @canonical_host_type@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-libdir = @libdir@
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALLOCT=octinst.sh
-
-DESTDIR =
-
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-LN_S = @LN_S@
-MKOCTLINK = @MKOCTLINK@
-OCTLINK= @OCTLINK@
-
-AWK = @AWK@
-
-# Most octave programs will be compiled with $(MKOCTFILE).  Those which
-# cannot use mkoctfile directly can request the flags that mkoctfile 
-# would use as follows:
-#    FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# The following flags are for compiling programs that are independent
-# of Octave.  How confusing.
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CPICFLAG = @CPICFLAG@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXPICFLAG = @CXXPICFLAG@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPICFLAG = @FPICFLAG@
-
-OCTAVE = @OCTAVE@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-SHLEXT = @SHLEXT@
-
-@DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
-ver = @ver@
-MPATH = @mpath@
-OPATH = @opath@
-XPATH = @xpath@
-ALTMPATH = @altmpath@
-ALTOPATH = @altopath@
-
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
-
-%.o: %.c ; $(MKOCTFILE) -c $<
-%.o: %.f ; $(MKOCTFILE) -c $<
-%.o: %.cc ; $(MKOCTFILE) -c $<
-%.oct: %.cc ; $(MKOCTFILE) $<
--- a/main/audio/src/Makeconf.in	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/audio/src/Makeconf.in	Wed Aug 23 19:38:44 2006 +0000
@@ -55,10 +55,6 @@
 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
 SHLEXT = @SHLEXT@
 
-@DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
 ver = @ver@
 MPATH = @mpath@
 OPATH = @opath@
@@ -66,28 +62,9 @@
 ALTMPATH = @altmpath@
 ALTOPATH = @altopath@
 
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
+@DEFHAVE_LINUX_SOUNDCARD@
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
 %.o: %.cc ; $(MKOCTFILE) -c $<
 %.oct: %.cc ; $(MKOCTFILE) $<
-@DEFHAVE_LINUX_SOUNDCARD@
--- a/main/audio/src/configure.add	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-
-if test -e main/audio/NOINSTALL ; then
-
-	dnl Not installing so don't test for linux/soundcard.
-	STATUS=noinstall
-
-else
-
-	AC_DEFINE(have_oss)
-	AC_CHECK_HEADER(linux/soundcard.h, have_oss=yes, have_oss=no)
-	if test $have_oss = yes ; then
-	    STATUS="yes"
-	    AC_SUBST(DEFHAVE_LINUX_SOUNDCARD)
-	    DEFHAVE_LINUX_SOUNDCARD="HAVE_LINUX_SOUNDCARD=1"
-	else
-	    STATUS="linux/soundcard.h not found"
-	fi
-
-fi
-
-dnl Append the status message to the global status message.  This will
-dnl be displayed at the end of configuration so that the user doesn't
-dnl have to scan the list for critical details.
-
-STATUS_MSG="$STATUS_MSG
-   audio capture: $STATUS"
--- a/main/audio/src/configure.base	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/audio/src/configure.base	Wed Aug 23 19:38:44 2006 +0000
@@ -229,34 +229,6 @@
 [int F77_FUNC (hello, HELLO) (const int &n);],,
 [MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"])
 
-dnl
-dnl Check if octave still uses SLList.h
-dnl
-TRY_MKOCTFILE([for SLList.h],[#include <octave/SLList.h>],
-[MKOCTFILE="$MKOCTFILE -DHAVE_SLLIST_H"],)
-
-dnl
-dnl Check if octave has lo_ieee_nan_value
-dnl
-TRY_MKOCTFILE([for lo_ieee_nan_value],
-[ #include <octave/lo-ieee.h>
-int test(void) { lo_ieee_nan_value(); }],,
-[MKOCTFILE="$MKOCTFILE -DUSE_OCTAVE_NAN"])
-
-dnl
-dnl Check if octave is needs octave_idx_type
-dnl
-TRY_MKOCTFILE([for octave_idx_type],
-[#include <octave/oct-types.h>
-octave_idx_type test(void) { octave_idx_type idx = 1; return idx; }],,
-[MKOCTFILE="$MKOCTFILE -Doctave_idx_type=int"])
-
-dnl
-dnl Check if octave uses quit.h
-dnl
-TRY_MKOCTFILE([for quit.h],[#include <octave/quit.h>],,
-[MKOCTFILE="$MKOCTFILE -DNEED_OCTAVE_QUIT"])
-
 dnl **********************************************************
 
 dnl Evaluate an expression in octave
@@ -326,171 +298,17 @@
     ;;
 esac
 
-dnl Things needed to link to X11 programs
-dnl defines X_CFLAGS, X_LIBS
-AC_SUBST(DEFHAVE_X)
-AC_SUBST(X_LIBS)
-AC_SUBST(X_CFLAGS)
-AC_PATH_XTRA
-if test "$no_x" = yes ; then
-	DEFHAVE_X=
-	XSTATUS="no (plot/g{input,text,zoom,rab} will not work)"
+
+AC_DEFINE(have_oss)
+AC_CHECK_HEADER(linux/soundcard.h, have_oss=yes, have_oss=no)
+if test $have_oss = yes ; then
+    OSS_STATUS="yes"
+    AC_SUBST(DEFHAVE_LINUX_SOUNDCARD)
+    DEFHAVE_LINUX_SOUNDCARD="HAVE_LINUX_SOUNDCARD=1"
 else
-	DEFHAVE_X="HAVE_X=1"
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-	XSTATUS="yes"
+    OSS_STATUS="linux/soundcard.h not found"
 fi
 
-OCTAVE_CHECK_EXIST(autoload,[
-	HAVE_AUTOLOAD="yes"
-	OCTLINK=.octlink
-	MKOCTLINK=$TOPDIR/admin/octlink.sh
-],[
-	HAVE_AUTOLOAD="no"
-	OCTLINK=.oct
-	MKOCTLINK=$LN_S
-])
-AC_SUBST(HAVE_AUTOLOAD)
-AC_SUBST(OCTLINK)
-AC_SUBST(MKOCTLINK)
-
-OCTAVE_CHECK_EXIST(do_fortran_indexing,
-	[HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"],)
-AC_SUBST(HAVE_DO_FORTRAN_INDEXING)
-
-OCTAVE_CHECK_EXIST(propagate_empty_matrices,
-	[PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"],)
-AC_SUBST(HAVE_PROPAGATE_EMPTY_MATRICES)
-
-OCTAVE_CHECK_EXIST(ok_to_lose_imaginary_part,
-  [HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"],)
-AC_SUBST(HAVE_OK_TO_LOSE_IMAGINARY_PART)
-
-dnl Test for N-dimensional Arrays
-TRY_MKOCTFILE([for N-dim arrays],
-[#include <octave/dim-vector.h>],
-[HAVE_ND_ARRAYS="-DHAVE_ND_ARRAYS"],)
-AC_SUBST(HAVE_ND_ARRAYS)
-
-OCTAVE_CHECK_EXIST(class,[TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"],)
-AC_SUBST(TYPEID_HAS_CLASS)
-
-dnl Test for load/save functions in class
-TRY_MKOCTFILE([for load/save functions in class],
-[#include <octave/ov-scalar.h>
-int main (void) { octave_scalar a; a.load_ascii(std::cin); }],
-[CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],)
-AC_SUBST(CLASS_HAS_LOAD_SAVE)
-
-TRY_MKOCTFILE([for Octave_map indexing],
-[#include <octave/oct-map.h>
-int main(void) { Octave_map a; a[["key"]]; }],
-[HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],)
-AC_SUBST(HAVE_OCTAVE_MAP_INDEX)
-
-TRY_MKOCTFILE([for old Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=concat(a,a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OLD_OCTAVE_CONCAT"],)
-
-TRY_MKOCTFILE([for Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=a.concat(a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OCTAVE_CONCAT"],)
-AC_SUBST(HAVE_OCTAVE_CONCAT)
-
-TRY_MKOCTFILE([for swap_8_bytes],
-[#include <sys/types.h>
-#include <octave/config.h>
-#include <octave/byte-swap.h>
-int main(void) {long long a = 1; swap_8_bytes (&a,1);}],,
-[HAVE_SWAP_BYTES="-DHAVE_SWAP_BYTES"])
-AC_SUBST(HAVE_SWAP_BYTES)
-
-TRY_MKOCTFILE([for op_uplus],
-[#include <octave/config.h>
-#include <octave/ov.h>
-int main(void) {int i = octave_value::op_uplus;}],
-[HAVE_OCTAVE_UPLUS="-DHAVE_OCTAVE_UPLUS"],)
-AC_SUBST(HAVE_OCTAVE_UPLUS)
-
-dnl Test for the makeinfo program
-AC_CHECK_PROG(MAKEINFO,makeinfo,makeinfo)
-if [ test -n "$MAKEINFO" ]; then
-	dnl Check whether the makeinfo command accepts the 
-	dnl "--no-split" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for makeinfo --no-split])
-	ac_try="$MAKEINFO --no-split conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		MAKEINFO="$MAKEINFO --no-split"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
-
-dnl Test for the texi2dvi program
-AC_CHECK_PROG(TEXI2DVI,texi2dvi,texi2dvi)
-if [ test -n "$TEXI2DVI" ]; then
-	dnl Check whether the texi2dvi command accepts the 
-	dnl "--clean" option
-	cat > conftest.texi <<EOF
-\input texinfo
-@bye
-EOF
-	AC_MSG_CHECKING([that texi2dvi runs])
-	ac_try="$TEXI2DVI conftest.texi > /dev/null"
-	if AC_TRY_EVAL(ac_try) ; then
-	    AC_MSG_RESULT(yes)
-	    AC_MSG_CHECKING([for texi2dvi --clean])
-	    ac_try="$TEXI2DVI --clean conftest.texi > /dev/null"
-	    if AC_TRY_EVAL(ac_try) ; then
-		TEXI2DVI="$TEXI2DVI --clean"
-		AC_MSG_RESULT(yes)
-	    else
-		AC_MSG_RESULT(no)
-	    fi
-	else
-	    TEXI2DVI=""
-	    AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
-
-dnl Test for the texi2html program
-AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
-if [ test -n "$TEXI2HTML" ]; then
-	STATUS="yes"
-	dnl Check whether the texi2html command accepts the 
-	dnl "-split_chapter -number" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for texi2html --clean])
-	ac_try="$TEXI2HTML -split_chapter -number conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		TEXI2HTML="$TEXI2HTML -split_chapter -number"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-        dnl TeTex 3.0 on Suse is leaving a conftest directory
-	rm -rf conftest
-fi
-
-dnl Test for the dvipdf program
-AC_CHECK_PROG(DVIPDF,dvipdf,dvipdf)
-
-dnl Test for the dvips program
-AC_CHECK_PROG(DVIPS,dvips,dvips)
-
-MKDOC=$TOPDIR/admin/mkdoc
-AC_SUBST(MKDOC)
-
-MKTEXI=$TOPDIR/admin/mktexi
-AC_SUBST(MKTEXI)
-
 CONFIGURE_OUTPUTS="Makeconf octinst.sh"
 STATUS_MSG="
 octave commands will install into the following directories:
@@ -510,11 +328,4 @@
 octave-forge is configured with
    octave:      $OCTAVE (version $OCTAVE_VERSION)
    mkoctfile:	$MKOCTFILE for Octave $subver
-   X11 support:	$XSTATUS
-   makeinfo:    $MAKEINFO
-   texi2dvi:    $TEXI2DVI
-   texi2html:   $TEXI2HTML
-   mkdoc:       $MKDOC
-   mktexi:      $MKTEXI
-   dvips:       $DVIPS
-   dvipdf:      $DVIPDF"
+   audio capture: $OSS_STATUS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/comm/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,15 @@
+sinclude ../../Makeconf
+sinclude ../../pkg.mk
+
+PKG_FILES = $(patsubst %, comm/%, COPYING DESCRIPTION INDEX PKG_ADD \
+	$(wildcard src/*) $(wildcard inst/*) doc/comms.pdf)
+SUBDIRS = doc/
+
+.PHONY: $(SUBDIRS)
+
+pre-pkg/%::
+	for _dir in $(SUBDIRS); do \
+	  make -C $$_dir; \
+	done
+
+clean: $(SUBDIRS)
--- a/main/comm/doc/Makefile	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/comm/doc/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -1,6 +1,6 @@
 sinclude ../../../Makeconf
 
-# "make dist" clears the MKDOC, etc variables. Fill them in if needed
+# Fill in the variables as it makes testing the package manager easier
 ifeq ($(MKDOC),)
 MKDOC = ../../../admin/mkdoc
 MKTEXI = ../../../admin/mktexi
@@ -11,20 +11,18 @@
 
 INFODOC = comms.info
 PSDOC = $(patsubst %.info,%.ps,$(INFODOC))
+PDFDOC = $(patsubst %.info,%.pdf,$(INFODOC))
 TEXIDOC = $(patsubst %.info,%.texi,$(INFODOC))
-DOCS = $(INFODOC) $(PSDOC)
+DOCS = $(INFODOC) $(PDFDOC) 
 DOCSTRINGS = DOCSTRINGS
 INDEX = ../INDEX
 TMPDELETES = *.log *.dvi $(DOCSTRINGS) $(TEXIDOC) *~
-DELETES = *.ps *.pdf *.info $(DOCS) *.html
-
-all : $(INFODOC) $(PSDOC)
+DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html
 
-install : 
-	@$(INSTALL) -d $(DESTDIR)$(MPATH)/comm; \
-	if test "x$(MAKEINFO)" != "x"; then \
-	  $(INSTALL_DATA) $(INFODOC) $(DESTDIR)$(MPATH)/comm ; \
-	fi
+all : $(PDFDOC) ../inst/doc.info
+
+../inst/doc.info : $(INFODOC)
+	cp -f $(INFODOC) ../inst/doc.info
 
 %.dvi : %.texi
 	@if test "x$(TEXI2DVI)" != "x"; then \
@@ -71,10 +69,7 @@
 
 clean:
 	@echo "Cleaning..."; \
-	$(RM) -f $(TMPDELETES)
-
-realclean: clean
-	@$(RM) -f $(DELETES)
+	$(RM) -f $(DELETES)
 
 dist: all
 
--- a/main/comm/src/.cvsignore	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/comm/src/.cvsignore	Wed Aug 23 19:38:44 2006 +0000
@@ -1,3 +1,4 @@
+configure
 *.d
 *.o
 PKG_ADD
--- a/main/comm/src/Makeconf.base	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-
-## Makeconf is automatically generated from Makeconf.base and Makeconf.add
-## in the various subdirectories.  To regenerate, use ./autogen.sh to
-## create a new ./Makeconf.in, then use ./configure to generate a new
-## Makeconf.
-
-OCTAVE_FORGE = 1
-
-SHELL = @SHELL@
-
-canonical_host_type = @canonical_host_type@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-libdir = @libdir@
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALLOCT=octinst.sh
-
-DESTDIR =
-
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-AWK = @AWK@
-
-# Most octave programs will be compiled with $(MKOCTFILE).  Those which
-# cannot use mkoctfile directly can request the flags that mkoctfile 
-# would use as follows:
-#    FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# The following flags are for compiling programs that are independent
-# of Octave.  How confusing.
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CPICFLAG = @CPICFLAG@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXPICFLAG = @CXXPICFLAG@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPICFLAG = @FPICFLAG@
-
-OCTAVE = @OCTAVE@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-SHLEXT = @SHLEXT@
-
-ver = @ver@
-MPATH = @mpath@
-OPATH = @opath@
-XPATH = @xpath@
-ALTMPATH = @altmpath@
-ALTOPATH = @altopath@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
-
-%.o: %.c ; $(MKOCTFILE) -c $<
-%.o: %.f ; $(MKOCTFILE) -c $<
-%.o: %.cc ; $(MKOCTFILE) -c $<
-%.oct: %.cc ; $(MKOCTFILE) $<
--- a/main/comm/src/Makeconf.in	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/comm/src/Makeconf.in	Wed Aug 23 19:38:44 2006 +0000
@@ -58,15 +58,6 @@
 ALTMPATH = @altmpath@
 ALTOPATH = @altopath@
 
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
-
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
 %.o: %.cc ; $(MKOCTFILE) -c $<
--- a/main/comm/src/autogen.sh	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/comm/src/autogen.sh	Wed Aug 23 19:38:44 2006 +0000
@@ -4,10 +4,6 @@
 rm -f configure.in
 echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
 cat configure.base >> configure.in
-files=`find . -name configure.add -print`
-if test ! -z "$files" ; then
-  cat $files >> configure.in
-fi
 cat <<EOF >> configure.in
   AC_OUTPUT(\$CONFIGURE_OUTPUTS)
   dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
@@ -22,12 +18,3 @@
 EOF
 
 autoconf && rm -f configure.in
-
-## Generate ./Makeconf.in
-rm -f Makeconf.in
-cp Makeconf.base Makeconf.in
-files=`find . -name Makeconf.add -print`
-if test ! -z "$files" ; then
-  cat $files >> Makeconf.in
-fi
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/fixed/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,16 @@
+sinclude ../../Makeconf
+sinclude ../../pkg.mk
+
+PKG_FILES = $(patsubst %, fixed/%, COPYING DESCRIPTION INDEX PKG_ADD \
+	$(wildcard src/*) $(wildcard inst/*) $(wildcard examples/*) \
+	doc/fixed.pdf)
+SUBDIRS = doc/
+
+.PHONY: $(SUBDIRS)
+
+pre-pkg/%::
+	for _dir in $(SUBDIRS); do \
+	  make -C $$_dir; \
+	done
+
+clean: $(SUBDIRS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/fixed/doc/Makeconf.add	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,1 @@
+OCTAVEFIXEDVERSION = @OCTAVEFIXEDVERSION@
--- a/main/fixed/doc/Makefile	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/doc/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -1,6 +1,6 @@
 sinclude ../../../Makeconf
 
-# "make dist" clears the MKDOC, etc variables. Fill them in if needed
+# Fill in the variables as it makes testing the package manager easier
 ifeq ($(MKDOC),)
 MKDOC = ../../../admin/mkdoc
 MKTEXI = ../../../admin/mktexi
@@ -11,25 +11,19 @@
 
 FIXEDVERTARGET = fixedversion.txi
 INFODOC = fixed.info
-PSDOC = fixed.ps
-DOCS = $(INFODOC) $(PSDOC)
+PSDOC = $(patsubst %.info,%.ps,$(INFODOC))
+PDFDOC = $(patsubst %.info,%.pdf,$(INFODOC))
+TEXIDOC = $(patsubst %.info,%.texi,$(INFODOC))
+DOCS = $(INFODOC) $(PDFDOC)
 DOCSTRINGS = DOCSTRINGS
 INDEX = ../INDEX
-TMPDELETES = *.log *.dvi $(DOCSTRINGS) $(FIXEDVERTARGET) fixed.texi *~
-DELETES = *.ps *.pdf *.info $(DOCS) *.html
-
-all : $(INFODOC) $(PSDOC)
+TMPDELETES = *.log *.dvi $(DOCSTRINGS) $(FIXEDVERTARGET) $(TEXIDOC) *~
+DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html
 
-ifndef OCTAVE_FORGE
-install :
-	@echo "Where exactly do you want me to install to!!!"
-else
-install : 
-	@$(INSTALL) -d $(DESTDIR)$(MPATH)/fixed; \
-	if test "x$(MAKEINFO)" != "x"; then \
-	  $(INSTALL_DATA) $(INFODOC) $(DESTDIR)$(MPATH)/fixed ; \
-	fi
-endif
+all : $(PDFDOC) ../inst/doc.info
+
+../inst/doc.info : $(INFODOC)
+	cp -f $(INFODOC) ../inst/doc.info
 
 $(FIXEDVERTARGET) :
 	@echo "Creating $@"; $(RM) -f $@; \
@@ -80,10 +74,7 @@
 
 clean:
 	@echo "Cleaning..."; \
-	$(RM) -f $(TMPDELETES)
-
-realclean: clean
-	@$(RM) -f $(DELETES)
+	$(RM) -f $(DELETES)
 
 dist: all
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/fixed/doc/configure.add	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,3 @@
+dnl version of the fixed point code
+OCTAVEFIXEDVERSION="0.7.0"
+AC_SUBST(OCTAVEFIXEDVERSION)
--- a/main/fixed/examples/Makefile	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/examples/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -1,4 +1,4 @@
-sinclude ../../../Makeconf
+sinclude ../src/Makeconf
 
 LINKTARGETS = fifft.oct
 LINKSOURCE = ffft.oct
@@ -7,12 +7,12 @@
 OBJECTS = $(patsubst %.cc,%.o,$(SOURCES))
 DEPENDS = $(patsubst %.cc,%.d,$(SOURCES))
 INCLUDES = -I..
-DEFINES = $(HAVE_RESIZE_AND_FILL)
+DEFINES = 
 
 ifeq (1,$(OCT_INCLUDES_LIB))
   MOFLAGS = $(INCLUDES)
 else
-  MOFLAGS = $(INCLUDES) -L.. -loctave_fixed
+  MOFLAGS = $(INCLUDES) -L../ -loctave_fixed
 endif
 
 .PHONY: all clean count
--- a/main/fixed/examples/ffft.cc	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/examples/ffft.cc	Wed Aug 23 19:38:44 2006 +0000
@@ -340,11 +340,7 @@
 
   // Resize and fill sort with zeros..
   sort.resize (0);
-#if HAVE_RESIZE_AND_FILL
   sort.resize_and_fill (size, 0);
-#else
-  sort.resize (size, 0);
-#endif
 
   for (int i=0; i<size; i++)
     for (int j=1, k=size/4; j<size; j<<=2, k>>=2)
--- a/main/fixed/examples/ffft.h	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/examples/ffft.h	Wed Aug 23 19:38:44 2006 +0000
@@ -27,10 +27,6 @@
 #if !defined (ffft_h)
 #define ffft_h 1
 
-#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION)
-#pragma interface
-#endif
-
 #include "fixed.h"
 
 template <class S, class C, class CV>
--- a/main/fixed/inst/.cvsignore	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/inst/.cvsignore	Wed Aug 23 19:38:44 2006 +0000
@@ -1,3 +1,4 @@
+doc.info
 *.d
 *.o
 PKG_ADD
--- a/main/fixed/src/Makeconf.add	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-OCTAVEFIXEDVERSION = @OCTAVEFIXEDVERSION@
--- a/main/fixed/src/Makeconf.base	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-
-## Makeconf is automatically generated from Makeconf.base and Makeconf.add
-## in the various subdirectories.  To regenerate, use ./autogen.sh to
-## create a new ./Makeconf.in, then use ./configure to generate a new
-## Makeconf.
-
-OCTAVE_FORGE = 1
-
-SHELL = @SHELL@
-
-canonical_host_type = @canonical_host_type@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-libdir = @libdir@
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALLOCT=octinst.sh
-
-DESTDIR =
-
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-LN_S = @LN_S@
-MKOCTLINK = @MKOCTLINK@
-OCTLINK= @OCTLINK@
-
-AWK = @AWK@
-
-# Most octave programs will be compiled with $(MKOCTFILE).  Those which
-# cannot use mkoctfile directly can request the flags that mkoctfile 
-# would use as follows:
-#    FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# The following flags are for compiling programs that are independent
-# of Octave.  How confusing.
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CPICFLAG = @CPICFLAG@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXPICFLAG = @CXXPICFLAG@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPICFLAG = @FPICFLAG@
-
-OCTAVE = @OCTAVE@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-SHLEXT = @SHLEXT@
-
-@DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
-ver = @ver@
-MPATH = @mpath@
-OPATH = @opath@
-XPATH = @xpath@
-ALTMPATH = @altmpath@
-ALTOPATH = @altopath@
-
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
-
-%.o: %.c ; $(MKOCTFILE) -c $<
-%.o: %.f ; $(MKOCTFILE) -c $<
-%.o: %.cc ; $(MKOCTFILE) -c $<
-%.oct: %.cc ; $(MKOCTFILE) $<
--- a/main/fixed/src/Makeconf.in	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/src/Makeconf.in	Wed Aug 23 19:38:44 2006 +0000
@@ -85,12 +85,9 @@
 
 MKDOC = @MKDOC@
 MKTEXI = @MKTEXI@
+OCTAVEFIXEDVERSION = @OCTAVEFIXEDVERSION@
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
 %.o: %.cc ; $(MKOCTFILE) -c $<
 %.oct: %.cc ; $(MKOCTFILE) $<
-
-HAVE_RESIZE_AND_FILL = @HAVE_RESIZE_AND_FILL@
-MX_ND_RED_NUM = @MX_ND_RED_NUM@
-OCTAVEFIXEDVERSION = @OCTAVEFIXEDVERSION@
--- a/main/fixed/src/Makefile	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/src/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -3,17 +3,6 @@
 FIXEDVERTARGET = fixedversion.h
 FIXEDTARGET = fixed.oct 
 
-FIXEDLINKTARGETS = $(patsubst %,%$(OCTLINK), \
-	isfixed fabs fcos fcosh fsin fsinh \
-	ftan ftanh fsqrt fexp flog flog10 fround \
-	ffloor fceil fprod fsum fsumsq fcumsum \
-	fcumprod display_fixed_operations reset_fixed_operations \
-	freshape fdiag fatan2 freal fimag fconj \
-	farg fangle \
-	fixed_point_warn_overflow fixed_point_debug \
-	fixed_point_count_operations fixed_point_version \
-	fixed_point_library_version) 
-
 SUBDIRS = examples doc
 
 ifeq (,$(findstring cygwin,$(canonical_host_type)))
@@ -37,7 +26,7 @@
   FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES))
   FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES))
 
-  TARGETS = $(FIXEDTARGET) $(FIXEDLINKTARGETS)
+  TARGETS = $(FIXEDTARGET)
   OBJECTS = $(FIXEDOBJECTS)
 
   EXTRALIBS =
@@ -60,7 +49,7 @@
   FIXEDOBJECTS = $(patsubst %.cc,%.o,$(FIXEDSOURCES))
   FIXEDDEPENDS = $(FIXEDLIBDEPENDS) $(patsubst %.cc,%.d,$(FIXEDSOURCES))
 
-  TARGETS = $(FIXEDLIBTARGET) $(FIXEDTARGET) $(FIXEDLINKTARGETS)
+  TARGETS = $(FIXEDLIBTARGET) $(FIXEDTARGET)
   OBJECTS = $(FIXEDLIBOBJECTS) $(FIXEDOBJECTS)
 
   EXTRALIBS = -L./ -loctave_fixed
@@ -138,11 +127,6 @@
 	@echo "Creating $@"; $(RM) -f $@; \
 	echo "#define OCTAVEFIXEDVERSION \"$(OCTAVEFIXEDVERSION)\"" > $@
 
-$(FIXEDLINKTARGETS) :
-	@echo "Symbolic linking $@ to $(FIXEDTARGET)"; \
-	$(RM) -f $@ ; \
-	$(MKOCTLINK) $(FIXEDTARGET) $@
-
 ifneq (,$(DEPENDS))
   sinclude $(DEPENDS)
 endif
--- a/main/fixed/src/autogen.sh	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/src/autogen.sh	Wed Aug 23 19:38:44 2006 +0000
@@ -4,10 +4,6 @@
 rm -f configure.in
 echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
 cat configure.base >> configure.in
-files=`find . -name configure.add -print`
-if test ! -z "$files" ; then
-  cat $files >> configure.in
-fi
 cat <<EOF >> configure.in
   AC_OUTPUT(\$CONFIGURE_OUTPUTS)
   dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
@@ -23,11 +19,3 @@
 
 autoconf && rm -f configure.in
 
-## Generate ./Makeconf.in
-rm -f Makeconf.in
-cp Makeconf.base Makeconf.in
-files=`find . -name Makeconf.add -print`
-if test ! -z "$files" ; then
-  cat $files >> Makeconf.in
-fi
-
--- a/main/fixed/src/configure.add	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-if test -e main/fixed/NOINSTALL ; then
-	dnl Not installing, do nothing
-	STATUS=noinstall
-else
-	dnl version of the fixed point code
-	OCTAVEFIXEDVERSION="0.7.0"
- 	AC_SUBST(OCTAVEFIXEDVERSION)
-fi
-
--- a/main/fixed/src/configure.base	Tue Aug 22 21:04:47 2006 +0000
+++ b/main/fixed/src/configure.base	Wed Aug 23 19:38:44 2006 +0000
@@ -375,6 +375,10 @@
 MKTEXI=$TOPDIR/admin/mktexi
 AC_SUBST(MKTEXI)
 
+dnl version of the fixed point code
+OCTAVEFIXEDVERSION="0.7.0"
+AC_SUBST(OCTAVEFIXEDVERSION)
+
 CONFIGURE_OUTPUTS="Makeconf octinst.sh"
 STATUS_MSG="
 octave commands will install into the following directories:
--- a/main/release.sh	Tue Aug 22 21:04:47 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-## List of packages to release
-packages="audio combinatorics comm control econometrics fixed general geometry gsl ident image io irsa linear-algebra miscellaneous octcdf optim parallel plot signal specfun special-matrix splines statistics strings struct symbolic time vrml"
-
-## The current date to append to .tar.gz filenames
-## XXX: It would be better to use the version numbers from DESCRIPTION
-##      files when creating seperate packages and the date when creating
-##      the bundle.
-d=`date --rfc-3339=date`
-
-## For each package:
-for p in $packages; do
-    ## Check if src/autogen.sh exist and (possibly) execute it
-    if [ -f $p/src/autogen.sh ]; then
-        cd $p/src
-        sh ./autogen.sh
-        cd ../..
-    fi
-    ## Create the tar-ball
-    tar -zcf $p-$d.tar.gz $p
-done
-
-## Create bundle
-tar -zcf octave-forge-main-$d.tar.gz $packages
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/.cvsignore	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,5 @@
+*.tar.gz
+octave
+.octave_packages
+tmp
+*~
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/.octaverc	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,2 @@
+global OCTAVE_PACKAGE_PREFIX;
+OCTAVE_PACKAGE_PREFIX='./tmp';
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/Makefile	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,32 @@
+sinclude ../Makeconf
+
+ifeq ($(MPATH),$(OPATH))
+  LOADPATH = $(MPATH)//:
+else
+  LOADPATH = $(MPATH)//:$(OPATH)//:
+endif
+HOME=`pwd`
+RUN_OCTAVE= HOME=$(HOME) ../admin/run_forge $(OCTAVE) -H -q --no-site-file
+BUNDLE = octave-forge.tar.gz
+PACKAGES = $(filter-out $(BUNDLE), $(wildcard *.tar.gz))
+
+.PHONY: $(PACKAGES)
+
+# Do nothing for the all target 
+all:
+
+# Assume all packages have .tar.gz extensions
+clean:
+	rm *.tar.gz *~ build-stamp .octave-packages
+	rm -fr install
+
+check: build-stamp
+	../admin/run_forge
+
+build-stamp: $(PACKAGES)
+	touch build-stamp
+
+# No spaces in eval argumnet please!!
+$(PACKAGES) :
+	if [! -d octave/ ]; then mkdir octave; fi
+	$(RUN_OCTAVE) --eval "pkg('install','$@')"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/README	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,1 @@
+This is the target directory, where the source packages are placed.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg.mk	Wed Aug 23 19:38:44 2006 +0000
@@ -0,0 +1,28 @@
+# These are stub rules for the construction of packages
+
+pkg = $(filter-out %/,$(subst /,/ ,$@))
+ifeq ($(PKG_FILE),)
+# Use the wildcard on INDEX and PKG_ADD as well to allow for their absence
+PKG_FILES = $(pkg)/COPYING $(pkg)/DESCRIPTION \
+	$(wildcard $(pkg)/INDEX) $(wildcard $(pkg)/PKG_ADD) \
+	$(wildcard $(pkg)/inst/*) $(wildcard $(pkg)/src/*)
+endif
+REAL_PKG_FILES = $(filter-out $(pkg)/%/CVS $(pkg)/%/.cvsignore %~, $(PKG_FILES))
+
+pkg/%: pre-pkg/%
+	cd ..; \
+	ver=`grep "Version:" $(pkg)/DESCRIPTION | sed -e "s/Version: *//"`; \
+	tar -zcf $(PKGDIR)/$(pkg)-$$ver.tar.gz $(REAL_PKG_FILES); \
+	cd $(pkg); \
+	$(MAKE) post-pkg/$(pkg)
+
+pre-pkg/%::
+	if [ -f src/autogen.sh ]; then \
+          cd src; \
+          sh ./autogen.sh; \
+          cd ..; \
+	fi
+
+# By default do nothing post packaging. Therefore trailing TAB is important!!!
+post-pkg/%::
+