From d1242b0aea1078c91c4b35e07ab3b16b19248a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
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')

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 7186473e4e3c87f2e0a02339d146da331cf8b01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 14 Sep 2011 16:35:27 +0200
Subject: Remove unused lib/orber/include/Makefile

---
 lib/orber/include/Makefile | 66 ----------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 lib/orber/include/Makefile

(limited to 'lib')

diff --git a/lib/orber/include/Makefile b/lib/orber/include/Makefile
deleted file mode 100644
index 219b7085e6..0000000000
--- a/lib/orber/include/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
-	../include/ifr_types.hrl \
-	../include/orber_pi.hrl
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt clean docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-
-
-release_docs_spec:
-
-
-- 
cgit v1.2.3


From bb3f5af90f947d63e36cc9922acb9958acb0ab49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
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')

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