From d1242b0aea1078c91c4b35e07ab3b16b19248a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 14 Sep 2011 12:10:46 +0200 Subject: Remove lib/orber/include/* from the primary bootstrap The include files for orber are included in the primary bootstrap, probably for historical reasons. They are not needed there, because no applications compiled in the secondary bootstrap need them. Therefore, install the lib/orber/include/* in the bootstrap at the end of the second bootstrap stage. --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Makefile') diff --git a/lib/Makefile b/lib/Makefile index 7f4c309da9..be86696ca3 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -83,7 +83,7 @@ endif ifdef BOOTSTRAP SUB_DIRECTORIES = \ - kernel stdlib compiler orber/include + kernel stdlib compiler else ifdef SECONDARY_BOOTSTRAP SUB_DIRECTORIES = hipe parsetools asn1/src -- cgit v1.2.3 From bb3f5af90f947d63e36cc9922acb9958acb0ab49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 14 Sep 2011 16:13:15 +0200 Subject: Merge the fourth bootstrap stage into the third bootstrap stage The sasl application used to have snmp MIBs, thus requiring the snmp and sasl applications to be built in separate bootstrap stage. Since the MIBs in sasl have been moved to the otp_mibs application, the third and fourth bootstrap stages can be merged. --- lib/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'lib/Makefile') diff --git a/lib/Makefile b/lib/Makefile index be86696ca3..98d746925f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -89,13 +89,9 @@ else SUB_DIRECTORIES = hipe parsetools asn1/src else ifdef TERTIARY_BOOTSTRAP - SUB_DIRECTORIES = snmp - else - ifdef FOURTH_BOOTSTRAP - SUB_DIRECTORIES = sasl jinterface ic syntax_tools - else # Not bootstrap build - SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES) - endif + SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools + else # Not bootstrap build + SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES) endif endif endif -- cgit v1.2.3