Mercurial > hg > octave-lyh

changeset 1904:6dd50f51cf0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-02-10 01:03:40 by jwe]
author jwe
date Sat, 10 Feb 1996 01:06:30 +0000
parents 1ab98f7789c9
children 39717752e3a2
files liboctave/Array-flags.cc liboctave/Makefile.in
diffstat 2 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array-flags.cc
+++ b/liboctave/Array-flags.cc
@@ -31,16 +31,10 @@
 
 #if defined (HEAVYWEIGHT_INDEXING)
 #if defined (OCTAVE_SOURCE)
-#include "user-prefs.h"
-int& dfi_flag = user_pref.do_fortran_indexing;
-int& pcv_flag = user_pref.prefer_column_vectors;
-int& pzo_flag = user_pref.prefer_zero_one_indexing;
-int& rre_flag = user_pref.resize_on_range_error;
-#else
-int dfi_flag = 0;
-int pcv_flag = 0;
-int pzo_flag = 0;
-int rre_flag = 0;
+int liboctave_dfi_flag = 0;
+int liboctave_pcv_flag = 0;
+int liboctave_pzo_flag = 0;
+int liboctave_rre_flag = 0;
 #endif
 #endif
 
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -18,11 +18,16 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-MATRIX_INC := Array.h Array-idx.h MArray.h Matrix.h mx-base.h \
-	mx-defs.h mx-ext.h CColVector.h CDiagMatrix.h CMatrix.h \
-	CRowVector.h CmplxAEPBAL.h CmplxCHOL.h CmplxDET.h CmplxHESS.h \
-	CmplxLU.h CmplxQR.h CmplxQRP.h CmplxSCHUR.h CmplxSVD.h EIG.h \
-	chMatrix.h \
+LIBOCTAVE_LFLAGS = -L../libcruft -L../readline -L../kpathsea \
+	-L../glob -L. $(RLD_FLAG)
+
+LIBOCTAVE_LIBS = -lcruft -lreadline -lkpathsea -lglob
+
+MATRIX_INC := Array.h Array-flags.h Array-idx.h MArray.h Matrix.h \
+	mx-base.h mx-defs.h mx-ext.h CColVector.h CDiagMatrix.h \
+	CMatrix.h CRowVector.h CmplxAEPBAL.h CmplxCHOL.h CmplxDET.h \
+	CmplxHESS.h CmplxLU.h CmplxQR.h CmplxQRP.h CmplxSCHUR.h \
+	CmplxSVD.h EIG.h chMatrix.h \
 	dColVector.h dDiagMatrix.h dMatrix.h dRowVector.h dbleAEPBAL.h \
 	dbleCHOL.h dbleDET.h dbleGEPBAL.h dbleHESS.h dbleLU.h dbleQR.h \
 	dbleQRP.h dbleSCHUR.h dbleSVD.h
@@ -42,7 +47,7 @@
 	Array-str.cc \
 	MArray-C.cc MArray-ch.cc MArray-i.cc MArray-d.cc MArray-s.cc
 
-MATRIX_SRC := Array-ext.cc CColVector.cc CDiagMatrix.cc CMatrix.cc \
+MATRIX_SRC := Array-flags.cc CColVector.cc CDiagMatrix.cc CMatrix.cc \
 	CRowVector.cc CmplxAEPBAL.cc CmplxCHOL.cc CmplxDET.cc \
 	CmplxHESS.cc CmplxLU.cc CmplxQR.cc CmplxQRP.cc CmplxSCHUR.cc \
 	CmplxSVD.cc EIG.cc chMatrix.cc dColVector.cc dDiagMatrix.cc \
@@ -98,7 +103,7 @@
 stamp-shared: $(PICOBJ)
 	if $(SHARED_LIBS); then \
 	  $(CXX) -shared -o liboctave.$(SHLEXT) $(PICOBJ) \
-	  -L../libcruft -lcruft; \
+	  $(LIBOCTAVE_LFLAGS) $(LIBOCTAVE_LIBS); \
 	else true; fi
 	touch stamp-shared