Mercurial > octave-nkf
changeset 2633:eb58c59bd223
[project @ 1997-01-27 21:32:14 by jwe]
| author | jwe |
|---|---|
| date | Mon, 27 Jan 1997 21:32:15 +0000 |
| parents | b8a3dd7e2e1a |
| children | eebc31f84a4d |
| files | ChangeLog configure.in src/Makefile.in |
| diffstat | 3 files changed, 38 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 27 19:49:33 1997 +0000 +++ b/ChangeLog Mon Jan 27 21:32:15 1997 +0000 @@ -1,6 +1,8 @@ Mon Jan 27 00:10:10 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Add check for usleep(). + (bsd_gcc_kluge_targets_frag): New fragment. + * Makefile.in: Delete `internal' targets. (static-binary-dist, dynamic-binary-dist): Special cases.
--- a/configure.in Mon Jan 27 19:49:33 1997 +0000 +++ b/configure.in Mon Jan 27 21:32:15 1997 +0000 @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.250 $) +AC_REVISION($Revision: 1.251 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -583,7 +583,7 @@ fi -f77_rules_frag=Makerules.f77 +f77_rules_frag=Makefrag.f77 if $have_fortran_compiler; then changequote(,)dnl cat << \EOF > $f77_rules_frag @@ -634,7 +634,7 @@ if test -z "$FLIBS"; then AC_MSG_WARN([I found f2c but not libf2c.a, or libF77.a and libI77.a]) fi - f77_rules_frag=Makerules.f77 + f77_rules_frag=Makefrag.f77 cat << \EOF > $f77_rules_frag %.c : %.f @@ -942,14 +942,41 @@ esac AC_SUBST(VOID_SIGHANDLER) +### A system dependent kluge or two. + AC_CHECK_FUNCS(getrusage times) - case "$canonical_host_type" in *-*-cygwin32) AC_DEFINE(RUSAGE_TIMES_ONLY, 1) ;; esac +bsd_gcc_kluge_targets_frag= +case "$canonical_host_type" in + *-*-386bsd* | *-*-openbsd* | *-*-netbsd* | *-*-freebsd*) + bsd_gcc_kluge_targets_frag=Makefrag.bsd + cat << \EOF > $bsd_gcc_kluge_targets_frag + +lex.o: lex.cc + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + +pt-plot.o: pt-plot.cc + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + +symtab.o: symtab.cc + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + +toplev.o: toplev.cc + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + +unwind-prot.o: unwind-prot.cc + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $< + +EOF + ;; +esac +AC_SUBST_FILE(bsd_gcc_kluge_targets_frag) + ### Checks for other programs used for building, testing, installing, ### and running Octave. ###
--- a/src/Makefile.in Mon Jan 27 19:49:33 1997 +0000 +++ b/src/Makefile.in Mon Jan 27 21:32:15 1997 +0000 @@ -18,12 +18,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -XALL_CXXFLAGS_1 = $(subst -fexternal-templates, , $(ALL_CXXFLAGS)) -XALL_CXXFLAGS = $(subst -fno-implicit-templates, , $(XALL_CXXFLAGS_1)) +PT_FLAGS = -fexternal-templates -fno-implicit-templates +CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT_FLAGS), $(ALL_CXXFLAGS)) %.df : %.cc @echo making $@ from $< - @$(CXXCPP) -c $(CPPFLAGS) $(XALL_CXXFLAGS) -DMAKE_BUILTINS $< \ + @$(CXXCPP) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) -DMAKE_BUILTINS $< \ | $(srcdir)/mkdefs > $@.t @mv $@.t $@ @@ -245,6 +245,8 @@ $(MAKEDEPS): defaults.h oct-gperf.h oct-conf.h +@bsd_gcc_kluge_targets_frag@ + check: all .PHONY: check