Mercurial > hg > octave-avbm
changeset 3647:4cdb8c0ef5f0
[project @ 2000-03-25 07:28:09 by jwe]
author | jwe |
---|---|
date | Sat, 25 Mar 2000 07:28:11 +0000 |
parents | e85efffe12a5 |
children | 3074e565689c |
files | doc/Makefile.in libcruft/ChangeLog libcruft/Makefile.in octMakefile.in scripts/Makefile.in scripts/control/Makefile.in scripts/statistics/Makefile.in |
diffstat | 7 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -36,7 +36,6 @@ .PHONY: ../BUGS ../INSTALL.OCTAVE $(SUBDIRS): - echo making all in $@ $(MAKE) -C $@ all .PHONY: $(SUBDIRS)
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,10 @@ +2000-03-25 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (LIBRARIES): Conditionally define. + (libraries): Depend on $(SUBDIRS) only. + Make $(LIBRARIES) using a recursive invocation of make once + $(SUBDIRS) are up to date. + 2000-03-21 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (libcruft.$(LIBEXT)): New target.
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -40,7 +40,6 @@ .PHONY: all $(SUBDIRS): - echo making all in $@ $(MAKE) -C $@ all .PHONY: $(SUBDIRS) @@ -68,17 +67,20 @@ ifeq ($(SHARED_LIBS), true) ifeq ($(STATIC_LIBS), true) - libraries: $(SUBDIRS) libcruft.$(LIBEXT) libcruft.$(SHLEXT) + LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT) else - libraries: $(SUBDIRS) libcruft.$(SHLEXT) + LIBRARIES = libcruft.$(SHLEXT) endif else ifeq ($(STATIC_LIBS), true) - libraries: $(SUBDIRS) libcruft.$(LIBEXT) + LIBRARIES = libcruft.$(LIBEXT) else - libraries: + LIBRARIES = endif endif + +libraries: $(SUBDIRS) + $(MAKE) $(LIBRARIES) .PHONY: libraries libcruft.$(LIBEXT): $(CRUFT_OBJ)
--- a/octMakefile.in +++ b/octMakefile.in @@ -72,7 +72,6 @@ .PHONY: all src: $(SUBDIRS) - echo making all in $@ $(MAKE) -C $@ all .PHONY: src @@ -85,7 +84,6 @@ chmod a+rx $@ $(SUBDIRS): - echo making all in $@ $(MAKE) -C $@ all .PHONY: $(SUBDIRS)
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -44,7 +44,6 @@ .PHONY: all $(SUBDIRS): - echo making all in $@ $(MAKE) -C $@ all .PHONY: $(SUBDIRS)