Mercurial > octave
diff Makeconf.in @ 518:2349d5721cd9
[project @ 1994-07-19 14:31:14 by jwe]
author | jwe |
---|---|
date | Tue, 19 Jul 1994 14:31:14 +0000 |
parents | 68c580e45518 |
children | b4692246e165 |
line wrap: on
line diff
--- a/Makeconf.in Wed Jul 13 14:38:02 1994 +0000 +++ b/Makeconf.in Tue Jul 19 14:31:14 1994 +0000 @@ -65,6 +65,7 @@ UGLY_ALL_CFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(GCC_IEEE_FP_FLAG) $(CFLAGS) CXX = @CXX@ +CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ EXTERNAL_TEMPLATES = @EXTERNAL_TEMPLATES@ ALL_CXXFLAGS = $(INCFLAGS) $(DEFS) $(EXTERNAL_TEMPLATES) \ @@ -143,27 +144,27 @@ # Here is a rule for generating dependencies for .cc files: %.d: %.cc - rm -f $@ - -if test "$(srcdir)" = "." ; then \ + @echo making $@ from $< + @rm -f $@ + @-if test "$(srcdir)" = "." ; then \ $(CXX) -MM $(CPPFLAGS) $(ALL_CXXFLAGS) $< | \ - sed -e 's/$*\.o/& $@/g' > $@.tmp && \ - mv $@.tmp $@ ; \ + sed -e 's/$*\.o/& $@/g' > $@.tmp ; \ else \ $(CXX) -MM $(CPPFLAGS) $(ALL_CXXFLAGS) $< | \ - sed -e 's/$*\.o/& $@/g' -e 's,$(srcdir)/,,g' > $@.tmp && \ - mv $@.tmp $@ ; \ + sed -e 's/$*\.o/& $@/g' -e 's,$(srcdir)/,,g' > $@.tmp ; \ fi + @mv $@.tmp $@ # And one for .c files.too: %.d: %.c - rm -f $@ - -if test "$(srcdir)" = "." ; then \ + @echo making $@ from $< + @rm -f $@ + @-if test "$(srcdir)" = "." ; then \ $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \ - sed -e 's/$*\.o/& $@/g' > $@.tmp && \ - mv $@.tmp $@ ; \ + sed -e 's/$*\.o/& $@/g' > $@.tmp ; \ else \ $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \ - sed -e 's/$*\.o/& $@/g' -e 's,$(srcdir)/,,g' > $@.tmp && \ - mv $@.tmp $@ ; \ + sed -e 's/$*\.o/& $@/g' -e 's,$(srcdir)/,,g' > $@.tmp ; \ fi + @mv $@.tmp $@