diff options
| author | Jose <jose@zeroc.com> | 2014-04-30 19:26:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-04-30 19:26:20 +0200 |
| commit | 1dca44f49cf4ec1a000378972787ead020696b66 (patch) | |
| tree | 98caa6120e50c0591f1551dd2d956832789a31b3 /cpp | |
| parent | Fixed parallel build issue (diff) | |
| download | ice-1dca44f49cf4ec1a000378972787ead020696b66.tar.bz2 ice-1dca44f49cf4ec1a000378972787ead020696b66.tar.xz ice-1dca44f49cf4ec1a000378972787ead020696b66.zip | |
Fixed IceGrid tests Windows makefile
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/Makefile.mak | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/cpp/test/IceGrid/Makefile.mak b/cpp/test/IceGrid/Makefile.mak index 19754433e5b..ecea19801a9 100644 --- a/cpp/test/IceGrid/Makefile.mak +++ b/cpp/test/IceGrid/Makefile.mak @@ -7,26 +7,25 @@ # # ********************************************************************** -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - - -SUBDIRS = simple deployer session update noRestartUpdate activation replicaGroup allocation replication distribution admin - - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done +top_srcdir = ..\.. + +!include $(top_srcdir)/config/Make.rules.mak + + +SUBDIRS = activation \ + admin \ + allocation \ + deployer \ + distribution \ + fileLock \ + noRestartUpdate \ + replicaGroup \ + replication \ + session \ + simple \ + update + +$(EVERYTHING):: + @for %i in ( $(SUBDIRS) ) do \ + @echo "making $@ in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 |