Fix dmake, it now depends on simplecpp::simplifyPath

This commit is contained in:
Daniel Marjamäki 2017-06-21 15:29:00 +02:00
parent 1e12ec241c
commit 2665e6e60c
2 changed files with 4 additions and 4 deletions

View File

@ -265,8 +265,8 @@ check: all
checkcfg: cppcheck checkcfg: cppcheck
./test/cfg/runtests.sh ./test/cfg/runtests.sh
dmake: tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o dmake: tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o externals/simplecpp/simplecpp.o
$(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o -Ilib $(LDFLAGS) $(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS)
run-dmake: dmake run-dmake: dmake
./dmake ./dmake

View File

@ -377,8 +377,8 @@ int main(int argc, char **argv)
fout << "\t./testrunner -q\n\n"; fout << "\t./testrunner -q\n\n";
fout << "checkcfg:\tcppcheck\n"; fout << "checkcfg:\tcppcheck\n";
fout << "\t./test/cfg/runtests.sh\n\n"; fout << "\t./test/cfg/runtests.sh\n\n";
fout << "dmake:\ttools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o\n"; fout << "dmake:\ttools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o externals/simplecpp/simplecpp.o\n";
fout << "\t$(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n"; fout << "\t$(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o lib/pathmatch.o lib/path.o externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS)\n\n";
fout << "run-dmake: dmake\n"; fout << "run-dmake: dmake\n";
fout << "\t./dmake\n\n"; fout << "\t./dmake\n\n";
fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n"; fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n";