From 159e420146cadd9c88f6c599e8f490bce92a8167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Wed, 21 Jun 2017 17:59:00 +0200 Subject: [PATCH] dmake: fix SRCDIR=build build. The problem was hardcoded "lib" path which needs to be $(SRCDIR) --- Makefile | 4 ++-- tools/dmake.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7633dfdc4..df8f37a5c 100644 --- a/Makefile +++ b/Makefile @@ -265,8 +265,8 @@ check: all checkcfg: cppcheck ./test/cfg/runtests.sh -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 externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS) +dmake: tools/dmake.o cli/filelister.o $(SRCDIR)/pathmatch.o $(SRCDIR)/path.o externals/simplecpp/simplecpp.o + $(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o $(SRCDIR)/pathmatch.o $(SRCDIR)/path.o externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS) run-dmake: dmake ./dmake diff --git a/tools/dmake.cpp b/tools/dmake.cpp index f51628a5d..ae7622c93 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -377,8 +377,8 @@ int main(int argc, char **argv) fout << "\t./testrunner -q\n\n"; fout << "checkcfg:\tcppcheck\n"; fout << "\t./test/cfg/runtests.sh\n\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 externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS)\n\n"; + fout << "dmake:\ttools/dmake.o cli/filelister.o $(SRCDIR)/pathmatch.o $(SRCDIR)/path.o externals/simplecpp/simplecpp.o\n"; + fout << "\t$(CXX) $(CXXFLAGS) -o $@ tools/dmake.o cli/filelister.o $(SRCDIR)/pathmatch.o $(SRCDIR)/path.o externals/simplecpp/simplecpp.o -Ilib $(LDFLAGS)\n\n"; fout << "run-dmake: dmake\n"; fout << "\t./dmake\n\n"; fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n";