diff --git a/src/makefile b/src/makefile index 65be75f1867e3b46ac16d4a3144099a021e6de2e..5fc135a9f30a969f697b01c99b5fdc67868a0840 100755 --- a/src/makefile +++ b/src/makefile @@ -5,13 +5,11 @@ # APP_DIR = zmapApp -MAKE_DIRS = $(APP_DIR) zmapmanager zmapserver zmapthreads zmaputils zmapwindow +MAKE_DIRS = $(APP_DIR) zmapAppmanager zmapserver zmapthreads zmaputils zmapwindow -all: makebindir - @for d in $(MAKE_DIRS); do \ - (cd $$d ; echo ; echo 'make '$@' in '$$d ; $(MAKE) $@ ; echo) ; \ - done +all: makebindir libs zmap + @echo 'made ZMap libraries and executables...' clean: makebindir @for d in $(MAKE_DIRS); do \ @@ -19,6 +17,12 @@ clean: makebindir done @rm -f $(ZMAPAPP_LIB) $(ZMAP_LIB) +# note that we issue a "make all" in the subdirectories, not a "make libs" +libs: makebindir + @for d in $(MAKE_DIRS); do \ + (cd $$d ; echo ; echo 'make all in '$$d ; $(MAKE) 'all' ; echo) ; \ + done + zmap : makebindir @cd $(APP_DIR) ; echo ; echo 'make '$@ ; $(MAKE) $@ ; echo