diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-01-25 12:50:41 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-01-25 12:50:41 -0330 |
| commit | 70f132150e5f2a4a687917c7238030cbe01dc9b3 (patch) | |
| tree | 31d77c406964bb6eaeaa3d0e8863f17d83ebdc05 | |
| parent | removing VC71 (diff) | |
| download | ice-70f132150e5f2a4a687917c7238030cbe01dc9b3.tar.bz2 ice-70f132150e5f2a4a687917c7238030cbe01dc9b3.tar.xz ice-70f132150e5f2a4a687917c7238030cbe01dc9b3.zip | |
make clean from top-level does not clean cpp til last
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | Makefile.mak | 15 |
2 files changed, 20 insertions, 9 deletions
@@ -8,14 +8,22 @@ # ********************************************************************** SUBDIRS = cpp java cs py rb php +CLEAN_SUBDIRS = java cs py rb php cpp DEPEND_SUBDIRS = cpp cs py rb php INSTALL_SUBDIRS = cpp cs py rb php -all clean:: +all:: @for subdir in $(SUBDIRS); \ do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ + echo "making all in $$subdir"; \ + ( cd $$subdir && $(MAKE) all ) || exit 1; \ + done + +clean:: + @for subdir in $(CLEAN_SUBDIRS); \ + do \ + echo "making clean in $$subdir"; \ + ( cd $$subdir && $(MAKE) clean ) || exit 1; \ done depend:: diff --git a/Makefile.mak b/Makefile.mak index 500d82369cc..e4c591571c7 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -11,28 +11,31 @@ top_srcdir = cpp !include cpp/config/Make.rules.mak SUBDIRS = cpp java py +CLEAN_SUBDIRS = java py cpp DEPEND_SUBDIRS = cpp py INSTALL_SUBDIRS = cpp py !if "$(CPP_COMPILER)" == "VC60" SUBDIRS = $(SUBDIRS) php rb +CLEAN_SUBDIRS = php rb $(CLEAN_SUBDIRS) DEPEND_SUBDIRS = $(DEPEND_SUBDIRS) php rb INSTALL_SUBDIRS = $(INSTALL_SUBDIRS) php rb !else SUBDIRS = $(SUBDIRS) cs vb +CLEAN_SUBDIRS = cs vb $(CLEAN_SUBDIRS) DEPEND_SUBDIRS = $(DEPEND_SUBDIRS) cs vb INSTALL_SUBDIRS = $(INSTALL_SUBDIRS) cs !endif -$(EVERYTHING):: +all:: @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) $@" || exit 1 + @echo "making all in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 -all clean:: +clean:: @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) $@" || exit 1 + @echo "making clean in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) clean" || exit 1 depend:: @for %i in ( $(DEPEND_SUBDIRS) ) do \ |