Mercurial > hg > octave-nkf
changeset 2358:b3d7a8e3bcc7
[project @ 1996-08-21 03:11:55 by jwe]
author | jwe |
---|---|
date | Wed, 21 Aug 1996 03:13:11 +0000 |
parents | 5ac79d79da10 |
children | 6d3cafa2798b |
files | libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in |
diffstat | 7 files changed, 89 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 20 22:09:08 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makerules.in (stamp-picdir): Only create a pic subdirectory if + SHARED_LIBS is true AND FPICFLAG is not empty. + Wed May 22 15:07:00 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-shared): Use CC, not CXX to create shared
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -66,9 +66,10 @@ stamp-shared: $(CRUFT_PICOBJ) if $(SHARED_LIBS); then \ - $(CC) -shared -o libcruft.$(SHLEXT) $(CRUFT_PICOBJ) \ - $(SH_FLIBS); \ - else true; fi + $(CC) -shared -o libcruft.$(SHLEXT) $(CRUFT_PICOBJ) $(SH_FLIBS) ; \ + else \ + true ; \ + fi touch stamp-shared $(CRUFT_OBJ):
--- a/libcruft/Makerules.in +++ b/libcruft/Makerules.in @@ -30,9 +30,17 @@ .PHONY: all stamp-picdir: - if [ -n "$(FPICFLAG)" ]; then \ - if [ -d pic ]; then true; else mkdir pic ; fi ; \ - else true; fi + if [ "$(SHARED_LIBS)" = true ]; then \ + if [ -n "$(FPICFLAG)" ]; then \ + if [ -d pic ]; then \ + true ; \ + else \ + mkdir pic ; \ + fi ; \ + fi ; \ + else \ + true ; \ + fi touch stamp-picdir install: all
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,8 @@ Tue Aug 20 17:38:46 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makefile.in (stamp-picdir): Only create a pic subdirectory if + SHARED_LIBS is true AND CPICFLAG or CXXPICFLAG is not empty. + * idx-vector.cc (IDX_VEC_REP::is_colon_equiv): Rename arg sort to sort_uniq. If sort_uniq is nonzero, sort the elements and make them uniq.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -99,9 +99,17 @@ touch stamp-prereq stamp-picdir: - if [ -n "$(CXXPICFLAG)" ]; then \ - if [ -d pic ]; then true; else mkdir pic ; fi ; \ - else true; fi + if [ "$(SHARED_LIBS)" = true ]; then \ + if [ -n "$(CPICFLAG)" ] || [ -n "$(CXXPICFLAG)" ]; then \ + if [ -d pic ]; then \ + true ; \ + else \ + mkdir pic ; \ + fi ; \ + fi ; \ + else \ + true ; \ + fi touch stamp-picdir liboctave.a: $(OBJECTS) @@ -111,8 +119,10 @@ stamp-shared: $(PICOBJ) if $(SHARED_LIBS); then \ $(CXX) -shared -o liboctave.$(SHLEXT) $(PICOBJ) \ - $(LIBOCTAVE_LFLAGS) $(LIBOCTAVE_LIBS); \ - else true; fi + $(LIBOCTAVE_LFLAGS) $(LIBOCTAVE_LIBS) ; \ + else \ + true ; \ + fi touch stamp-shared extract_stat = sed 's/@l@//g; s/@L@//g; /@LSTAT_ONLY@/d'
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ Tue Aug 20 17:41:19 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makefile.in: Only define pattern rules for making .oct files if + OCTAVE_LITE is true. + Only add pic/ to $(TI_OBJ) if $(SHARED_LIBS) is true. + (stamp-picdir): Only create a pic subdirectory if SHARED_LIBS or + OCTAVE_LITE is true AND CPICFLAG or CXXPICFLAG is not empty. + * minmax.cc (Fmin, Fmax): Deal with changes to Matrix class min/max methods.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -44,18 +44,20 @@ # How to make a .oct file from a .o file: -ifdef CXXPICFLAG -%.oct : pic/%.o - $(CXX) -shared -o $@ $< \ - $(OCTAVE_LFLAGS) \ - $(OCTAVE_LIBS) \ - $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ -else -%.oct : %.o - $(CXX) -shared -o $@ $< \ - $(OCTAVE_LFLAGS) \ - $(OCTAVE_LIBS) \ - $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ +ifeq ($(OCTAVE_LITE), true) + ifdef CXXPICFLAG + %.oct : pic/%.o + $(CXX) -shared -o $@ $< \ + $(OCTAVE_LFLAGS) \ + $(OCTAVE_LIBS) \ + $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ + else + %.oct : %.o + $(CXX) -shared -o $@ $< \ + $(OCTAVE_LFLAGS) \ + $(OCTAVE_LIBS) \ + $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ + endif endif DLD_SRC := balance.cc chol.cc colloc.cc dassl.cc det.cc eig.cc \ @@ -93,7 +95,10 @@ pt-plot.h pt-pr-code.h pt-walk.h sighandlers.h symtab.h \ syscalls.h sysdep.h systime.h syswait.h token.h toplev.h \ unwind-prot.h utils.h variables.h version.h \ - xdiv.h xpow.h Map.h SLStack.h Stack.h + xdiv.h xpow.h Map.h SLStack.h Stack.h \ + matrix.h complex-matrix.h char-matrix.h struct.h scalar.h \ + range.h complex.h all-va-args.h magic-colon.h base-value.h \ + char-matrix-str.h value.h TI_SRC := Array-oc.cc Array-os.cc Array-tc.cc Map-fnc.cc Map-tc.cc \ SLList-expr.cc SLList-misc.cc SLList-plot.cc SLList-str.cc \ @@ -104,8 +109,10 @@ TI_OBJ := $(patsubst %.cc, %.o, $(TI_SRC)) TI_PICOBJ := $(TI_OBJ) -ifdef CXXPICFLAG - TI_PICOBJ := $(addprefix pic/, $(TI_OBJ)) +ifeq ($(SHARED_LIBS), true) + ifdef CXXPICFLAG + TI_PICOBJ := $(addprefix pic/, $(TI_OBJ)) + endif endif SOURCES := arith-ops.cc data.cc defaults.cc dirfns.cc dynamic-ld.cc \ @@ -119,8 +126,10 @@ pt-mvr-base.cc pt-mvr.cc pt-plot.cc pt-pr-code.cc resource.cc \ sighandlers.cc strcasecmp.c strncase.c strfns.cc strftime.c \ symtab.cc syscalls.cc sysdep.cc timefns.cc token.cc toplev.cc \ - unwind-prot.cc utils.cc variables.cc xdiv.cc \ - xpow.cc + unwind-prot.cc utils.cc variables.cc xdiv.cc xpow.cc \ + base-value.cc char-matrix.cc matrix.cc complex-matrix.cc \ + range.cc scalar.cc complex.cc char-matrix-str.cc struct.cc \ + value.cc TEMPLATE_SRC = Map.cc SLStack.cc @@ -185,9 +194,17 @@ $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ stamp-picdir: - if [ -n "$(CPICFLAG)" ]; then \ - if [ -d pic ]; then true; else mkdir pic ; fi ; \ - else true; fi + if [ "$(SHARED_LIBS)" = true ] || [ "$(OCTAVE_LITE)" = true ]; then \ + if [ -n "$(CPICFLAG)" ] || [ -n "$(CXXPICFLAG)" ]; then \ + if [ -d pic ]; then \ + true ; \ + else \ + mkdir pic ; \ + fi ; \ + fi ; \ + else \ + true ; \ + fi touch stamp-picdir libraries: liboctinterp.a libtinst.a stamp-interp stamp-tinst @@ -205,8 +222,10 @@ $(CXX) -shared -o liboctinterp.$(SHLEXT) $(PICOBJ) \ $(OCTAVE_LFLAGS) \ -loctave -lcruft -ltinst -lreadline -lkpathsea \ - $(SH_TERMLIBS) $(SH_LIBS) -lg++; \ - else true; fi + $(SH_TERMLIBS) $(SH_LIBS) -lg++ ; \ + else \ + true ; \ + fi touch stamp-interp stamp-tinst: $(TI_PICOBJ) @@ -214,8 +233,10 @@ $(CXX) -shared -o libtinst.$(SHLEXT) $(TI_PICOBJ) \ $(OCTAVE_LFLAGS) \ -loctinterp -loctave -lcruft -lreadline -lkpathsea \ - $(SH_TERMLIBS) $(SH_LIBS) -lg++; \ - else true; fi + $(SH_TERMLIBS) $(SH_LIBS) -lg++ ; \ + else \ + true ; \ + fi touch stamp-tinst builtins.cc: $(DEF_FILES) mkbuiltins