-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Common Makefile rules: object files 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. * Common Makefile rules: code formatting 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.
- Loading branch information
Showing
9 changed files
with
48 additions
and
105 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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