549003a6557dbc88a0361a572f49a975a7e77bc7 hiram Tue Nov 12 10:20:40 2013 -0800 include localEnvironment.mk so that a local make will work in userApps build refs #9149 diff --git src/parasol/makefile src/parasol/makefile index 2122739..1aeac29 100644 --- src/parasol/makefile +++ src/parasol/makefile @@ -1,35 +1,36 @@ +include ../inc/localEnvironment.mk USE_DIRS = \ gensub2 \ para \ paraHub \ paraHubStop \ paraNode \ paraNodeStart \ paraNodeStatus \ paraNodeStop \ paraTestJob \ parasol all: $(USE_DIRS:%=%.all) lib.all: mkdir -p bin cd lib && $(MAKE) # make sure lib is built first, even in a parallel make %.all: lib.all cd $* && echo $* && $(MAKE) install: @echo 'parasol install, please copy ./bin/* where desired ...' clean: rm -f */*.o lib/*/*.a rm -f bin/* broad: cd lib && ${MAKE} cd broadNode && ${MAKE} cd broadHub && ${MAKE}