Common Makefile rules #451
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently we use a bit different build paths for object files: - src -> build/obj - jni -> build/obj/jni - tests -> build/tests/obj This is one of the reasons that build rules for C/C++ code are duplicated across Soter, Themis, ThemisPP, Themis-JNI, and tests. Use a more consistent approach for placing object files: all of them go into $(OBJ_PATH) and get suffixed by ".o". This way allows us to have a single common rule for building all C/C++ code: - src -> build/obj/src - jni -> build/obj/jni - tests -> build/obj/tests Note however that in some cases we have to use different compiler flags, mostly to setup proper header search paths. Use per-target CFLAGS variable settings for that.
Using consistent object file placement allows us to simplify formatting build rules in the same way. All marker files will not be placed in the same place as object files. This allows us to remove a lot of special cases and use common formatting rules for all C/C++ code. clang-format and clang-tidy require correct compilation flags. Thankfully, CFLAGS values are already correctly set everywhere so we do not need to do anything special for that. Though, JsThemis is a bit special, because we do not compile it normally.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently we use a bit different build paths for object files:
This is one of the reasons that build rules for C/C++ code are duplicated across Soter, Themis, ThemisPP, Themis-JNI, and tests.
Use a more consistent approach for placing object files: all of them go into
$(OBJ_PATH)and get suffixed by.o. This way allows us to have a single common rule for building all C/C++ code:Note however that in some cases we have to use different compiler flags, mostly to setup proper header search paths. Use per-target CFLAGS variable settings for that.
Using consistent object file placement allows us to simplify formatting build rules in the same way. All marker files will now be placed in the same place as object files.
This allows us to remove a lot of special cases and use common formatting rules for all C/C++ code.
clang-format and clang-tidy require correct compilation flags. Thankfully, CFLAGS values are already correctly set everywhere so we do not need to do anything special for that. Though, JsThemis is a bit special, because we do not compile it normally.