diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-19 14:57:32 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-19 14:57:32 +0200 |
| commit | 720b39f0b0cda409559e08e9fe0012b74d2462eb (patch) | |
| tree | 7c44e23b8c9c2263bc84fb32fe0614b8a513c916 /lib/Makefile | |
| parent | 171407b6afb043c7d56fb78c8692fab3b99c4be6 (diff) | |
| parent | bb3f5af90f947d63e36cc9922acb9958acb0ab49 (diff) | |
| download | otp-720b39f0b0cda409559e08e9fe0012b74d2462eb.tar.gz otp-720b39f0b0cda409559e08e9fe0012b74d2462eb.tar.bz2 otp-720b39f0b0cda409559e08e9fe0012b74d2462eb.zip | |
Merge branch 'bjorn/clean-up-bootstraps' into dev
* bjorn/clean-up-bootstraps:
Merge the fourth bootstrap stage into the third bootstrap stage
Remove unused lib/orber/include/Makefile
Remove lib/orber/include/* from the primary bootstrap
otp_build update_primary: Don't commit generated source files
primary bootstrap: Remove source files
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile index 7f4c309da9..98d746925f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -83,19 +83,15 @@ endif ifdef BOOTSTRAP SUB_DIRECTORIES = \ - kernel stdlib compiler orber/include + kernel stdlib compiler else ifdef SECONDARY_BOOTSTRAP 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 |