diff options
| -rw-r--r-- | Makefile | 48 | ||||
| -rw-r--r-- | config/Make.rules | 11 | ||||
| -rw-r--r-- | php/config/Make.rules | 6 |
3 files changed, 45 insertions, 20 deletions
@@ -7,15 +7,51 @@ # # ********************************************************************** -root_dir = . +SUBDIRS = cpp java cs py rb php +DEPEND_SUBDIRS = cpp cs py rb php +INSTALL_SUBDIRS = cpp cs py rb php -include $(root_dir)/config/Make.rules - -SUBDIRS = slice cpp java cs php py rb - -$(EVERYTHING):: +all clean:: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ done + +depend:: + @for subdir in $(DEPEND_SUBDIRS); \ + do \ + echo "making depend in $$subdir"; \ + ( cd $$subdir && $(MAKE) depend ) || exit 1; \ + done + +install:: + @for subdir in $(INSTALL_SUBDIRS); \ + do \ + echo "making install in $$subdir"; \ + ( cd $$subdir && $(MAKE) install ) || exit 1; \ + done + +cpp:: + echo "making all in cpp"; + ( cd cpp && $(MAKE) all ) || exit 1; + +java:: + echo "making all in java"; + ( cd java && $(MAKE) all ) || exit 1; + +cs:: + echo "making all in cs"; + ( cd cs && $(MAKE) all ) || exit 1; + +py:: + echo "making all in py"; + ( cd py && $(MAKE) all ) || exit 1; + +rb:: + echo "making all in rb"; + ( cd rb && $(MAKE) all ) || exit 1; + +php:: + echo "making all in php"; + ( cd php && $(MAKE) all ) || exit 1; diff --git a/config/Make.rules b/config/Make.rules deleted file mode 100644 index 3471607e774..00000000000 --- a/config/Make.rules +++ /dev/null @@ -1,11 +0,0 @@ -# ********************************************************************** -# -# 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/php/config/Make.rules b/php/config/Make.rules index 185fbb59879..0a71cd3d17f 100644 --- a/php/config/Make.rules +++ b/php/config/Make.rules @@ -8,7 +8,7 @@ # ********************************************************************** # -# Set value to 1 if you are building Ice for Ruby against an RPM installation +# Set value to 1 if you are building Ice for PHP against an RPM installation # of Ice. # USE_ICE_RPM ?= 0 @@ -22,14 +22,14 @@ $(error Ambiguous directives. Both ICE_HOME and USE_ICE_RPM are defined.) ICE_DIR = $(ICE_HOME) - ifneq ($(shell test -f $(ICE_DIR)/bin/icecpp && echo 0),0) + ifneq ($(shell test -f $(ICE_DIR)/bin/slice2cpp && echo 0),0) $(error Unable to locate Ice files in $(ICE_DIR). Please verify ICE_HOME is properly configured and Ice is correctly installed.) endif else ifeq ($(USE_ICE_RPM),1) ICE_DIR=/usr - ifneq ($(shell test -f $(ICE_DIR)/bin/icecpp && echo 0),0) + ifneq ($(shell test -f $(ICE_DIR)/bin/slice2cpp && echo 0),0) $(error Unable to locate Ice files in $(ICE_DIR). Please verify that the required Ice RPMs are properly installed.) endif else |