ICE-6032 - Windows does make install in test/demos

15 files changed, 68 insertions, 18 deletions

diff --git a/cpp/Makefile b/cpp/Makefile
index 5fb8e51d7b2..56e71327ff0 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -11,10 +11,13 @@ top_srcdir	= .
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test
+SUBDIRS		= config src include
 
-ifeq ($(shell uname | grep MINGW),)
-SUBDIRS		:= $(SUBDIRS) demo
+ifneq ($(MAKECMDGOALS),install)
+    SUBDIRS		:= $(SUBDIRS) test
+    ifeq ($(shell uname | grep MINGW),)
+        SUBDIRS		:= $(SUBDIRS) demo
+    endif
 endif
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak
index 0e93cd4c542..f0c14441d04 100644
--- a/cpp/Makefile.mak
+++ b/cpp/Makefile.mak
@@ -22,10 +22,13 @@ INSTALL_SUBDIRS	= "$(install_bindir)" "$(install_libdir)" "$(install_includedir)
 
 install:: install-common
 	@for %i in ( $(INSTALL_SUBDIRS) ) do \
-	    @if not exist %i \
+		@if not exist %i \
 		@echo "Creating %i..." && \
 		mkdir %i
 
+	@for %i in ( config src include ) do \
+		@echo "making $@ in %i" && \
+		cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 test::
 	@python $(top_srcdir)/allTests.py
 
@@ -54,18 +57,23 @@ unregister-sdk:
 
 install:: install-common
 	@for %i in ( $(INSTALL_SUBDIRS) ) do \
-	    @if not exist %i \
+		@if not exist %i \
 		@echo "Creating %i..." && \
 		mkdir %i
 !endif
 
-$(EVERYTHING)::
+$(EVERYTHING_EXCEPT_INSTALL)::
 	@for %i in ( $(SUBDIRS) ) do \
-	    @echo "making $@ in %i" && \
-	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-	    
-	    
+		@echo "making $@ in %i" && \
+		cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+		
 !if "$(WINRT)" == "yes"
+
+install::
+	@for %i in ( src include ) do \
+		@echo "making $@ in %i" && \
+		cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+
 install::
 	xcopy /s /y "$(top_srcdir)\SDKs" "$(prefix)\SDKs"
 	@echo Register SDK "$(SDK_NAME)" in Windows registry "$(SDK_KEY)"
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 0b5835b0803..1d472376951 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -229,6 +229,8 @@ MT 			= mt.exe
 
 EVERYTHING		= all clean install depend
 
+EVERYTHING_EXCEPT_INSTALL = all clean depend
+
 .SUFFIXES:
 .SUFFIXES:		.ice .cpp .c .obj .res .rc .h .d
 
diff --git a/cs/Makefile b/cs/Makefile
index 007745e2a09..610119544e3 100644
--- a/cs/Makefile
+++ b/cs/Makefile
@@ -11,7 +11,11 @@ top_srcdir	= .
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= src test demo
+SUBDIRS		= src
+
+ifneq ($(MAKECMDGOALS),install)
+SUBDIRS		= $(SUBDIRS) test demo
+endif
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_assembliesdir) $(install_mandir)
 
diff --git a/cs/Makefile.mak b/cs/Makefile.mak
index 4d0d28aa485..4364bd9b8f9 100644
--- a/cs/Makefile.mak
+++ b/cs/Makefile.mak
@@ -25,7 +25,7 @@ install:: install-common
 		@echo "Creating %i..." && \
 		mkdir %i
 
-$(EVERYTHING)::
+$(EVERYTHING_EXCEPT_INSTALL)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @echo "making $@ in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
@@ -47,6 +47,9 @@ installpath=$(prefix)\Assemblies
 !endif
 
 install::
+	@for %i in ( src config ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 	@echo Adding key "$(registrykey)" in Windows registry && \
 	@reg ADD "$(registrykey)" /ve /d "$(installpath)" /f || \
 	echo Could not add registry keyword "$(registrykey)" && exit 1
diff --git a/cs/config/Make.rules.mak.cs b/cs/config/Make.rules.mak.cs
index dedc913d6a8..7e067ca75c6 100644
--- a/cs/config/Make.rules.mak.cs
+++ b/cs/config/Make.rules.mak.cs
@@ -270,6 +270,7 @@ SLICEPARSERLIB		= $(ice_dir)\lib\slice.lib
 !endif
 
 EVERYTHING		= all clean install depend
+EVERYTHING_EXCEPT_INSTALL = all clean depend
 
 .SUFFIXES:
 .SUFFIXES:		.cs .ice
diff --git a/js/Makefile b/js/Makefile
index 5d65730f214..10544c63e8f 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -11,7 +11,10 @@ top_srcdir	= .
 
 include $(top_srcdir)/config/Make.rules.js
 
-SUBDIRS		= src assets test demo
+SUBDIRS		= src assets
+ifneq ($(MAKECMDGOALS),install)
+SUBDIRS		= $(SUBDIRS) test demo
+endif
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_moduledir)
 
diff --git a/js/Makefile.mak b/js/Makefile.mak
index b7b8899978a..5b4f8b786b0 100644
--- a/js/Makefile.mak
+++ b/js/Makefile.mak
@@ -21,10 +21,15 @@ install:: install-common
 	        @echo "Creating %i..." && \
 	        mkdir "%i"
 
-$(EVERYTHING)::
+$(EVERYTHING_EXCEPT_INSTALL)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @echo "making $@ in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 
+install::
+	@for %i in ( src ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+
 test::
 	@python $(top_srcdir)/allTests.py
diff --git a/js/config/Make.rules.mak.js b/js/config/Make.rules.mak.js
index 091b843d1a5..5e3de441c54 100644
--- a/js/config/Make.rules.mak.js
+++ b/js/config/Make.rules.mak.js
@@ -110,6 +110,7 @@ install:: all
 !endif
 
 EVERYTHING		= all clean install lint depend
+EVERYTHING_EXCEPT_INSTALL = all clean install lint depend
 
 .SUFFIXES:
 .SUFFIXES:		.js .ice .d
diff --git a/php/Makefile b/php/Makefile
index bf9f2deafa7..3b576e33219 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -11,7 +11,11 @@ top_srcdir	= .
 
 include $(top_srcdir)/config/Make.rules.php
 
-SUBDIRS		= src lib demo test
+SUBDIRS		= src lib
+ifneq ($(MAKECMDGOALS),install)
+SUBDIRS		= $(SUBDIRS) test demo
+endif
+
 INSTALL_SUBDIRS = $(install_phpdir) $(install_libdir)
 
 install:: install-common
diff --git a/php/Makefile.mak b/php/Makefile.mak
index 57e1b7cd37c..0175e05f8f1 100644
--- a/php/Makefile.mak
+++ b/php/Makefile.mak
@@ -18,10 +18,15 @@ install:: install-common
 	    @echo "Creating $(install_libdir)..." && \
 	    mkdir "$(install_libdir)"
 
-$(EVERYTHING)::
+$(EVERYTHING_EXCEPT_INSTALL)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @echo "making $@ in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 
+install::
+	@for %i in ( src lib ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+
 test::
 	@python $(top_srcdir)/allTests.py
diff --git a/php/config/Make.rules.mak.php b/php/config/Make.rules.mak.php
index aaeb3f1cc10..429da76dbde 100644
--- a/php/config/Make.rules.mak.php
+++ b/php/config/Make.rules.mak.php
@@ -199,6 +199,7 @@ SLICEPARSERLIB		= $(ice_dir)\lib\slice.lib
 !endif
 
 EVERYTHING		= all clean install depend
+EVERYTHING_EXCEPT_INSTALL = all clean depend
 
 .SUFFIXES:
 .SUFFIXES:		.cpp .obj .php .res .rc .d .ice
diff --git a/py/Makefile b/py/Makefile
index 04de2933a33..347440879da 100644
--- a/py/Makefile
+++ b/py/Makefile
@@ -11,7 +11,11 @@ top_srcdir	= .
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= modules python test
+SUBDIRS		= modules python
+
+ifneq ($(MAKECMDGOALS),install)
+SUBDIRS		= $(SUBDIRS) test
+endif
 
 INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir)
 
diff --git a/py/Makefile.mak b/py/Makefile.mak
index 45802ae2036..727580a3d21 100644
--- a/py/Makefile.mak
+++ b/py/Makefile.mak
@@ -18,10 +18,15 @@ install:: install-common
 	    @echo "Creating $(install_pythondir)..." && \
 	    mkdir "$(install_pythondir)"
 
-$(EVERYTHING)::
+$(EVERYTHING_EXCEPT_INSTALL)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @echo "making $@ in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 
+install::
+	@for %i in ( modules python ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+
 test::
 	@python $(top_srcdir)/allTests.py
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak
index 7aba8d1c21b..ee58bdc6fc9 100644
--- a/py/config/Make.rules.mak
+++ b/py/config/Make.rules.mak
@@ -136,6 +136,7 @@ SLICEPARSERLIB          = $(ice_dir)\lib\slice.lib
 MT			= mt.exe
 
 EVERYTHING		= all clean install depend
+EVERYTHING_EXCEPT_INSTALL all clean depend
 
 .SUFFIXES:
 .SUFFIXES:		.cpp .obj .py .res .rc .d .ice