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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 592ac6668b..8ff94964d1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,12 @@ autom4te.cache !/erts/preloaded/ebin/*.beam !/lib/*/test/*_SUITE_data/*.beam +# +# Generated source code files. +# +/bootstrap/lib/compiler/egen +/bootstrap/lib/stdlib/egen + # Compiler derivatives # # Do not use too creative wildcards. @@ -98,12 +104,12 @@ make/win32/ /bootstrap/bin/* /bootstrap/target -!/bootstrap/bin/*.script !/bootstrap/bin/*.boot /bootstrap/lib/asn1 /bootstrap/lib/hipe /bootstrap/lib/ic +/bootstrap/lib/orber /bootstrap/lib/parsetools /bootstrap/lib/sasl /bootstrap/lib/snmp |