Issue253 make support more extensions #266
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
Instead use the list of files in SOURCE within the Makefiles. We now create a rule for each file rather than relying on GNU Makefile expanding implicit rules (such as %.o: %.cpp ...). Fixed tests and bisect to work with this new framework. Did not update documentation or add new tests
This is to additionally test the functionality of using file endings other than .cpp.
It was needed to get the '%.o: %.cpp' rules to work with source files in different directories. Now that all each rule is spelled out individually, this is unused and unnecessary extra overhead.
A few things here and there now that a few things in the Makefile have changed.
|
I prioritized this issue because the Ares project has files with |
IanBriggs
approved these changes
May 21, 2019
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.
Fixes #253
Description:
In
Makefile.inandMakefile_bisect_binary.in, I replaced%.o: %.cpp ...) with individually created rules for each output object file from each source file.flit bisectstill works after this change.main.cppoutputsobj/main.cpp_gt.ofor thegttarget instead of the old nameobj/main_gt.o(i.e., the extension used to be removed -- no longer the case).VPATHfromMakefile.insince it is no longer needed. It was needed to find source files for rules of the%.o: %.cppvariety when they are spread out in different directories (think of VPATH as a search path for resolving these generic rules). Now that each file has its own individual rule, we no longer need to use VPATH.SOURCE += $(wildcard *.cpp)andSOURCE += $(wildcard tests/*.cpp)intocustom.mk. They are also found inMakefile.infor backward compatibility with oldcustom.mkfiles. ATODOwas placed inMakefile.insaying that those lines inMakefile.inare deprecated and will be removed in FLiT v3.0.The result of this change is that ANY file added to the
SOURCEvariable incustom.mkwill be compiled with the C++ compiler. Furthermore, it is possible to have both source filesmain.cppandmain.cxxsince the generated object file names will keep the file extension and will not collide.Documentation:
Just a little documentation updates that were either unnecessary or inconsistent with the new changes. I did not feel there was a need to create a specific section to address this change since it is pretty much expected functionality from a user's perspective (although it was an undocumented difference from implicit expectations).
Tests:
tests/flit_cli/flit_bisect/tst_bisect.py, rename one of the used source files fromfile4.cpptofile4.cxxto further test the new functionality.No new tests were added, simply leveraging existing tests.