New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge build systems in the tools subdirectory #812

Merged
merged 1 commit into from Sep 16, 2016

Conversation

Projects
None yet
2 participants
@shindere
Contributor

shindere commented Sep 14, 2016

Same line than PR #808 & co, see commit message for details.

shindere added a commit to shindere/ocaml that referenced this pull request Sep 15, 2016

Merge build systems in the tools subdirectory (#812)
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
Merge build systems in the tools subdirectory (#812)
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
@alainfrisch

Looks good to me. (Checked with git diff HEAD~1:tools/Makefile.shared HEAD:tools/Makefile that no spurious change was introduced during the operation.)

@alainfrisch alainfrisch merged commit f642ba7 into ocaml:trunk Sep 16, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@shindere shindere deleted the shindere:merge-tools-makefiles branch Sep 19, 2016

camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017

Merge build systems in the tools subdirectory (#812) (#812)
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment