Remove generated makefile circular dependency #33
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 of generating src/Makefile with all loops expanded, just put the loops directly into the rules. We already have similar loops in other Makefiles. After doing this, src/Makefile.nw only differs from src/Makefile by having a couple extra comments, so copy them over and delete src/Makefile.nw. We used to set src/Makefile as read-only since it was generated, but that is no longer necessary. Now there is one less step if you want to edit the variables at the top.
src/Makefile: Remove the $(LIBNAME) alias, we're replacing |LIBDIR| with $(LIB) elsewhere. Also remove the $(TEXNAME) alias. src/lib/Makefile: Skip the |LIBDIR| replacement on toascii, it has nothing needing replaced. Files in src/shell: Prepare them for |LIBDIR| replacement if necessary. Add a missing directory separator in notangle.1 following |TEXINPUTS|.
|
I ran into another problem that this change will fix. If I don't already have noweb installed and am trying to bootstrap, and Makefile.nw is newer than Makefile (for whatever reason), then it dies at the Make is smart enough to update the Makefile before updating any other targets. In this case it's wiping the Makefile contents since notangle doesn't exist yet, and then it can't continue. If you're not interested in merging this change, I think we need an additional installation step to |
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.
src/Makefileis generated fromsrc/Makefile.nw, mainly to unroll some loops. Two potential problems:src/Makefile.nw. However if I'm trying to bootstrap and don't already havenotangleinstalled, I must edit the generatedsrc/Makefileinstead. Editing here is repetitive and increases the chances that I'll miss something.src/Makefilewas generated, it's left in a read-only state bychmod -w. If I'm following the installation instructions and just want to edit some variables directly (instead of scripting it), I first have tochmod +wit.My solution is to put the loops directly into
src/Makefileso we no longer need to generate it.