From 016cca242f2dd0215252d37589f3fdd461218361 Mon Sep 17 00:00:00 2001 From: Hans Lambermont Date: Sun, 19 Jan 2003 21:17:45 +0000 Subject: [PATCH] reshuffle the 'install' target : - 'all' in extern/ first builds every subdir, then also 'install's the header files and the library. This way a top-level Makefile only needs to call 'all' for extern/ and have it build and install. - 'clean' still works as it should --- extern/Makefile | 7 ++++--- extern/ode/Makefile | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extern/Makefile b/extern/Makefile index 0225f78fabf..b39ddf09683 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -38,9 +38,10 @@ DIRS = ode include nan_subdirs.mk -install: +# we're not quite ready with the 'all' target just yet: +install all:: @for i in $(DIRS); do \ - echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\ - $(MAKE) -C $$i $@ || exit 1; \ + echo "====> $(MAKE) install in $(SOURCEDIR)/$$i" ;\ + $(MAKE) -C $$i install || exit 1; \ done diff --git a/extern/ode/Makefile b/extern/ode/Makefile index cd6a7dffaf6..812978a8e28 100644 --- a/extern/ode/Makefile +++ b/extern/ode/Makefile @@ -52,7 +52,6 @@ all: install: all ifeq ($(OS),$(findstring $(OS), "freebsd linux")) - @echo "====> $(MAKE) $@ in $(SOURCEDIR)" [ -d $(LCGDIR) ] || mkdir $(LCGDIR) [ -d $(NAN_ODE) ] || mkdir $(NAN_ODE) [ -d $(NAN_ODE)/include ] || mkdir $(NAN_ODE)/include