Mercurial > octave-nkf
changeset 1984:1c121da7b952
[project @ 1996-02-29 14:57:47 by jwe]
| author | jwe |
|---|---|
| date | Thu, 29 Feb 1996 14:59:38 +0000 |
| parents | aaf4ad3da905 |
| children | a9abae46d75f |
| files | Makeconf.in configure.in src/Makefile.in |
| diffstat | 3 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in Tue Feb 27 12:41:46 1996 +0000 +++ b/Makeconf.in Thu Feb 29 14:59:38 1996 +0000 @@ -231,19 +231,21 @@ # How to make .o files: -.c.o: - [ -z "$(CPICFLAG)" ] ||\ - $(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o pic/$@ +%.o : %.c $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -.cc.o: - [ -z "$(CXXPICFLAG)" ] ||\ - $(CXX) -c $(CPPFLAGS) $(CXXPICFLAG) $(ALL_CXXFLAGS) $< -o pic/$@ +%.o : %.cc $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< +pic/%.o : %.c + $(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@ + +pic/%.o : %.cc + $(CXX) -c $(CPPFLAGS) $(CXXPICFLAG) $(ALL_CXXFLAGS) $< -o $@ + # Here is a rule for generating dependencies for .cc files: -%.d: %.cc +%.d : %.cc @echo making $@ from $< @rm -f $@ @-if test "$(srcdir)" = "." ; then \ @@ -257,7 +259,7 @@ # And one for .c files.too: -%.d: %.c +%.d : %.c @echo making $@ from $< @rm -f $@ @-if test "$(srcdir)" = "." ; then \
--- a/configure.in Tue Feb 27 12:41:46 1996 +0000 +++ b/configure.in Thu Feb 29 14:59:38 1996 +0000 @@ -20,7 +20,7 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_REVISION($Revision: 1.167 $) +AC_REVISION($Revision: 1.168 $) AC_PREREQ(2.0) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -508,10 +508,11 @@ %.c : %.f %.o : %.f - [ -z "$(FPICFLAG)" ] || \ - $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o pic/$@ $(FC) -c $(ALL_FFLAGS) $< +pic/%.o : %.f + $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ + EOF changequote([,])dnl elif $have_f2c; then
--- a/src/Makefile.in Tue Feb 27 12:41:46 1996 +0000 +++ b/src/Makefile.in Thu Feb 29 14:59:38 1996 +0000 @@ -45,13 +45,13 @@ # How to make a .oct file from a .o file: ifdef CXXPICFLAG -%.oct: pic/%.o +%.oct : pic/%.o $(CXX) -shared -o $@ $< \ $(OCTAVE_LFLAGS) \ $(OCTAVE_LIBS) \ $(FLIBS) $(LEXLIB) $(TERMLIBS) $(LIBS) -lg++ else -%.oct: %.o +%.oct : %.o $(CXX) -shared -o $@ $< \ $(OCTAVE_LFLAGS) \ $(OCTAVE_LIBS) \