- Adding root makefile for Windows and UNIX.

- Fixup slice makefiles

22 files changed, 125 insertions, 33 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..bdd42569a7e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+root_dir	= .
+
+include $(root_dir)/config/Make.rules
+
+SUBDIRS		= slice cpp java cs php py rb 
+
+$(EVERYTHING)::
+	@for subdir in $(SUBDIRS); \
+	do \
+	    echo "making $@ in $$subdir"; \
+	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+	done
diff --git a/Makefile.mak b/Makefile.mak
new file mode 100644
index 00000000000..bebaa2d3506
--- /dev/null
+++ b/Makefile.mak
@@ -0,0 +1,29 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+root_dir	= .
+
+!include $(root_dir)/config/Make.rules.mak
+
+SUBDIRS		= slice cpp java
+
+!if "$(CPP_COMPILER)" == "VC60"
+SUBDIRS		= $(SUBDIRS) php rb
+!endif
+
+!if "$(CPP_COMPILER)" == "VC80"
+SUBDIRS		= $(SUBDIRS) cs py vb
+!endif
+
+$(EVERYTHING)::
+	@for %i in ( $(SUBDIRS) ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) $@" || exit 1
+
+
diff --git a/config/Make.rules b/config/Make.rules
new file mode 100644
index 00000000000..3471607e774
--- /dev/null
+++ b/config/Make.rules
@@ -0,0 +1,11 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = $(root_dir)/cpp
+include $(top_srcdir)/config/Make.rules
diff --git a/config/Make.rules.mak b/config/Make.rules.mak
new file mode 100644
index 00000000000..56256e250c9
--- /dev/null
+++ b/config/Make.rules.mak
@@ -0,0 +1,13 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = $(root_dir)/cpp
+
+!include $(top_srcdir)/config/Make.rules.mak
+
diff --git a/java/Makefile.mak b/java/Makefile.mak
new file mode 100755
index 00000000000..710a3514899
--- /dev/null
+++ b/java/Makefile.mak
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+all:
+	ant -emacs
+
+clean:
+	ant -emacs clean
+
+test::
+	@python .\allTests.py
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak
index 70629173cc2..66951e90536 100644
--- a/py/config/Make.rules.mak
+++ b/py/config/Make.rules.mak
@@ -39,8 +39,9 @@ CPP_COMPILER            = VC80
 #
 # Set PYTHON_HOME to your Python installation directory.
 #
-
+!if "$(PYTHON_HOME)" == ""
 PYTHON_HOME		= C:\Python24
+!endif
 
 #
 # STLPort is required if using MSVC++ 6.0. Change if STLPort
diff --git a/slice/Freeze/Makefile b/slice/Freeze/Makefile
index 1727e9ec77b..cb27b4cbf23 100644
--- a/slice/Freeze/Makefile
+++ b/slice/Freeze/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/Freeze ; \
diff --git a/slice/Freeze/Makefile.mak b/slice/Freeze/Makefile.mak
index 7058d9f21a2..1c12049c9c7 100644
--- a/slice/Freeze/Makefile.mak
+++ b/slice/Freeze/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\Freeze \
diff --git a/slice/Glacier2/Makefile b/slice/Glacier2/Makefile
index 3f9e9dba557..b40ab5abd0b 100644
--- a/slice/Glacier2/Makefile
+++ b/slice/Glacier2/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/Glacier2 ; \
diff --git a/slice/Glacier2/Makefile.mak b/slice/Glacier2/Makefile.mak
index b8f0776e71c..505f25d4834 100644
--- a/slice/Glacier2/Makefile.mak
+++ b/slice/Glacier2/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\Glacier2 \
diff --git a/slice/Ice/Makefile b/slice/Ice/Makefile
index 39c52fb2e71..16552b954ed 100644
--- a/slice/Ice/Makefile
+++ b/slice/Ice/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/Ice ; \
diff --git a/slice/Ice/Makefile.mak b/slice/Ice/Makefile.mak
index 87f75e3a72e..e638af52d25 100644
--- a/slice/Ice/Makefile.mak
+++ b/slice/Ice/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\Ice \
diff --git a/slice/IceBox/Makefile b/slice/IceBox/Makefile
index 16f186daa3f..ad628876bee 100644
--- a/slice/IceBox/Makefile
+++ b/slice/IceBox/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/IceBox ; \
diff --git a/slice/IceBox/Makefile.mak b/slice/IceBox/Makefile.mak
index bbc69685a72..89435102ec4 100644
--- a/slice/IceBox/Makefile.mak
+++ b/slice/IceBox/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\IceBox \
diff --git a/slice/IceGrid/Makefile b/slice/IceGrid/Makefile
index c1e3bbd44e7..3fb00513143 100644
--- a/slice/IceGrid/Makefile
+++ b/slice/IceGrid/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/IceGrid ; \
diff --git a/slice/IceGrid/Makefile.mak b/slice/IceGrid/Makefile.mak
index 896b9797e03..069a1e2bc45 100644
--- a/slice/IceGrid/Makefile.mak
+++ b/slice/IceGrid/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\IceGrid \
diff --git a/slice/IcePatch2/Makefile b/slice/IcePatch2/Makefile
index 871ae0e4232..27b16d83d09 100644
--- a/slice/IcePatch2/Makefile
+++ b/slice/IcePatch2/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/IcePatch2 ; \
diff --git a/slice/IcePatch2/Makefile.mak b/slice/IcePatch2/Makefile.mak
index 2cfc8d5505c..ed023c2ad65 100644
--- a/slice/IcePatch2/Makefile.mak
+++ b/slice/IcePatch2/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\IcePatch2 \
diff --git a/slice/IceStorm/Makefile b/slice/IceStorm/Makefile
index 5da5d732b38..572e609242c 100644
--- a/slice/IceStorm/Makefile
+++ b/slice/IceStorm/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ../..
+root_dir	= ../..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 install::
 	@if test ! -d $(install_slicedir)/IceStorm ; \
diff --git a/slice/IceStorm/Makefile.mak b/slice/IceStorm/Makefile.mak
index f1ab61f1975..5dc73aa225b 100644
--- a/slice/IceStorm/Makefile.mak
+++ b/slice/IceStorm/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..\..
+root_dir	= ..\..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 install::
 	@if not exist $(install_slicedir)\IceStorm \
diff --git a/slice/Makefile b/slice/Makefile
index 175b2cb5b3d..26e2d966fd2 100644
--- a/slice/Makefile
+++ b/slice/Makefile
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..
+root_dir	= ..
 
-include $(top_srcdir)/config/Make.rules
+include $(root_dir)/config/Make.rules
 
 SUBDIRS		= Freeze \
 		  Glacier2 \
diff --git a/slice/Makefile.mak b/slice/Makefile.mak
index 9b0ac55bbc9..dfbad9f3676 100644
--- a/slice/Makefile.mak
+++ b/slice/Makefile.mak
@@ -7,9 +7,9 @@
 #
 # **********************************************************************
 
-top_srcdir	= ..
+root_dir	= ..
 
-!include $(top_srcdir)/config/Make.rules.mak
+!include $(root_dir)/config/Make.rules.mak
 
 SUBDIRS		= Freeze \
 		  Glacier2 \