From 0ed2039a7bef0137c1c6723e0401f96b7bf71de3 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 29 Aug 2013 18:04:49 +0200
Subject: Add configure option --without-$app

This is used to skip the specified app when building and releasing
---
 lib/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/Makefile')

diff --git a/lib/Makefile b/lib/Makefile
index 9ddf3a0544..71313170b0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -52,6 +52,10 @@ else
   endif
 endif
 
+# Any applications listed in SKIP-APPLICATIONS should be skipped
+SKIP_FILE := $(wildcard SKIP-APPLICATIONS)
+SKIP_APPLICATIONS := $(if $(SKIP_FILE),$(shell cat $(SKIP_FILE)))
+SUB_DIRECTORIES := $(filter-out $(SKIP_APPLICATIONS),$(SUB_DIRECTORIES))
 
 # ----------------------------------------------------------------------
 include $(ERL_TOP)/make/otp_subdir.mk
-- 
cgit v1.2.3


From dbc8066d21384db9829e8b58cd99a4fc223e83ac Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 29 Aug 2013 18:06:38 +0200
Subject: Refactor and change EXTRA_APPLICATIONS to use ls

---
 lib/Makefile | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'lib/Makefile')

diff --git a/lib/Makefile b/lib/Makefile
index 71313170b0..47a6d5f9aa 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -19,20 +19,32 @@
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
-OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools \
+
+# These have to be built first
+ERTS_APPLICATIONS = stdlib sasl kernel compiler
+
+# Then these have to be build
+ERLANG_APPLICATIONS = tools test_server common_test runtime_tools \
 			inets xmerl edoc erl_docgen
+
+# These are only build if -a is given to otp_build or make is used directly
+ALL_ERLANG_APPLICATIONS = snmp otp_mibs appmon erl_interface asn1 jinterface \
+	          wx debugger reltool gs \
+	          ic mnesia crypto orber os_mon parsetools syntax_tools \
+	          pman public_key ssl toolbar tv observer odbc diameter \
+	          cosTransactions cosEvent cosTime cosNotification \
+	          cosProperty cosFileTransfer cosEventDomain et megaco webtool \
+		  eunit ssh typer percept eldap dialyzer hipe
+
 ifdef BUILD_ALL
-  OTHER_SUB_DIRECTORIES += \
-          snmp otp_mibs appmon erl_interface asn1 jinterface \
-          wx debugger reltool gs \
-          ic mnesia crypto orber os_mon parsetools syntax_tools \
-          pman public_key ssl toolbar tv observer odbc diameter \
-          cosTransactions cosEvent cosTime cosNotification \
-          cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-	  eunit ssh typer percept eldap dialyzer hipe
-  EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS)
-  EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE)))
+  ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS)
+
+# We use whildcard */ to figure out if there are any other applications
+# in here.
+  EXPECTED_APPLICATIONS := $(ERTS_APPLICATIONS) $(ERLANG_APPLICATIONS) \
+	autom4te.cache
+  EXTRA_APPLICATIONS += $(filter-out $(EXPECTED_APPLICATIONS),\
+				$(subst /,,$(wildcard */)))
 endif
 
 ifdef BOOTSTRAP
@@ -45,8 +57,8 @@ else
     ifdef TERTIARY_BOOTSTRAP
       SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx
     else # Not bootstrap build
-      SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) \
-			$(OTHER_SUB_DIRECTORIES) \
+      SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \
+			$(ERLANG_APPLICATIONS) \
 			$(EXTRA_APPLICATIONS)
     endif
   endif
-- 
cgit v1.2.3