summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjose <jose@zeroc.com>2016-06-09 17:44:40 +0200
committerjose <jose@zeroc.com>2016-06-09 17:44:40 +0200
commit0d8b4956939a3fd2a6b702974bd0c5b83444cac4 (patch)
tree062be87b70661c33557bd284082750a180abaf0a
parentDo not create slice symbolic link (diff)
downloadice-0d8b4956939a3fd2a6b702974bd0c5b83444cac4.tar.bz2
ice-0d8b4956939a3fd2a6b702974bd0c5b83444cac4.tar.xz
ice-0d8b4956939a3fd2a6b702974bd0c5b83444cac4.zip
Add NOTEST option to C++/PHP builds
-rw-r--r--cpp/Makefile4
-rw-r--r--php/Makefile4
2 files changed, 8 insertions, 0 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index dd52234fa8a..c7d9f6597e5 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -17,6 +17,10 @@ ifneq ($(MAKECMDGOALS),install)
SUBDIRS := $(SUBDIRS) test
endif
+ifeq ($(NOTEST),yes)
+ SUBDIRS := $(filter-out test, $(SUBDIRS))
+endif
+
INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \
$(install_configdir) $(install_mandir)
diff --git a/php/Makefile b/php/Makefile
index 35344832dd5..38f40e98378 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -17,6 +17,10 @@ ifneq ($(MAKECMDGOALS),install)
SUBDIRS := $(SUBDIRS) test
endif
+ifeq ($(NOTEST),yes)
+ SUBDIRS := $(filter-out test, $(SUBDIRS))
+endif
+
INSTALL_SUBDIRS = $(install_phpdir) $(install_libdir)
install:: install-common