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
This commit is contained in:
7
extern/Makefile
vendored
7
extern/Makefile
vendored
@@ -38,9 +38,10 @@ DIRS = ode
|
|||||||
|
|
||||||
include nan_subdirs.mk
|
include nan_subdirs.mk
|
||||||
|
|
||||||
install:
|
# we're not quite ready with the 'all' target just yet:
|
||||||
|
install all::
|
||||||
@for i in $(DIRS); do \
|
@for i in $(DIRS); do \
|
||||||
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
|
echo "====> $(MAKE) install in $(SOURCEDIR)/$$i" ;\
|
||||||
$(MAKE) -C $$i $@ || exit 1; \
|
$(MAKE) -C $$i install || exit 1; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
1
extern/ode/Makefile
vendored
1
extern/ode/Makefile
vendored
@@ -52,7 +52,6 @@ all:
|
|||||||
|
|
||||||
install: all
|
install: all
|
||||||
ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
|
ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
|
||||||
@echo "====> $(MAKE) $@ in $(SOURCEDIR)"
|
|
||||||
[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
|
[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
|
||||||
[ -d $(NAN_ODE) ] || mkdir $(NAN_ODE)
|
[ -d $(NAN_ODE) ] || mkdir $(NAN_ODE)
|
||||||
[ -d $(NAN_ODE)/include ] || mkdir $(NAN_ODE)/include
|
[ -d $(NAN_ODE)/include ] || mkdir $(NAN_ODE)/include
|
||||||
|
Reference in New Issue
Block a user