walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

dmake: update Makefile

This commit is contained in:
Daniel Marjamäki 2013-05-05 09:22:04 +02:00
parent ea60c5b14b
commit 3f5a858800
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -95,6 +95,7 @@ MAN_SOURCE=man/cppcheck.1.xml
LIBOBJ = $(SRCDIR)/check64bit.o \ LIBOBJ = $(SRCDIR)/check64bit.o \
$(SRCDIR)/checkassignif.o \ $(SRCDIR)/checkassignif.o \
$(SRCDIR)/checkautovariables.o \ $(SRCDIR)/checkautovariables.o \
$(SRCDIR)/checkbool.o \
$(SRCDIR)/checkboost.o \ $(SRCDIR)/checkboost.o \
$(SRCDIR)/checkbufferoverrun.o \ $(SRCDIR)/checkbufferoverrun.o \
$(SRCDIR)/checkclass.o \ $(SRCDIR)/checkclass.o \
@ -108,6 +109,7 @@ LIBOBJ = $(SRCDIR)/check64bit.o \
$(SRCDIR)/checkobsoletefunctions.o \ $(SRCDIR)/checkobsoletefunctions.o \
$(SRCDIR)/checkother.o \ $(SRCDIR)/checkother.o \
$(SRCDIR)/checkpostfixoperator.o \ $(SRCDIR)/checkpostfixoperator.o \
$(SRCDIR)/checksizeof.o \
$(SRCDIR)/checkstl.o \ $(SRCDIR)/checkstl.o \
$(SRCDIR)/checkuninitvar.o \ $(SRCDIR)/checkuninitvar.o \
$(SRCDIR)/checkunusedfunctions.o \ $(SRCDIR)/checkunusedfunctions.o \
@ -138,6 +140,7 @@ TESTOBJ = test/options.o \
test/test64bit.o \ test/test64bit.o \
test/testassignif.o \ test/testassignif.o \
test/testautovariables.o \ test/testautovariables.o \
test/testbool.o \
test/testboost.o \ test/testboost.o \
test/testbufferoverrun.o \ test/testbufferoverrun.o \
test/testcharvar.o \ test/testcharvar.o \
@ -166,6 +169,7 @@ TESTOBJ = test/options.o \
test/testpreprocessor.o \ test/testpreprocessor.o \
test/testrunner.o \ test/testrunner.o \
test/testsimplifytokens.o \ test/testsimplifytokens.o \
test/testsizeof.o \
test/teststl.o \ test/teststl.o \
test/testsuite.o \ test/testsuite.o \
test/testsuppressions.o \ test/testsuppressions.o \
@ -236,6 +240,9 @@ $(SRCDIR)/checkassignif.o: lib/checkassignif.cpp lib/checkassignif.h lib/config.
$(SRCDIR)/checkautovariables.o: lib/checkautovariables.cpp lib/checkautovariables.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h lib/checkuninitvar.h $(SRCDIR)/checkautovariables.o: lib/checkautovariables.cpp lib/checkautovariables.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h lib/checkuninitvar.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkautovariables.o $(SRCDIR)/checkautovariables.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkautovariables.o $(SRCDIR)/checkautovariables.cpp
$(SRCDIR)/checkbool.o: lib/checkbool.cpp lib/checkbool.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/mathlib.h lib/symboldatabase.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkbool.o $(SRCDIR)/checkbool.cpp
$(SRCDIR)/checkboost.o: lib/checkboost.cpp lib/checkboost.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h $(SRCDIR)/checkboost.o: lib/checkboost.cpp lib/checkboost.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkboost.o $(SRCDIR)/checkboost.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkboost.o $(SRCDIR)/checkboost.cpp
@ -275,6 +282,9 @@ $(SRCDIR)/checkother.o: lib/checkother.cpp lib/checkother.h lib/config.h lib/che
$(SRCDIR)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/checkpostfixoperator.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h $(SRCDIR)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/checkpostfixoperator.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkpostfixoperator.o $(SRCDIR)/checkpostfixoperator.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkpostfixoperator.o $(SRCDIR)/checkpostfixoperator.cpp
$(SRCDIR)/checksizeof.o: lib/checksizeof.cpp lib/checksizeof.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/symboldatabase.h lib/mathlib.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checksizeof.o $(SRCDIR)/checksizeof.cpp
$(SRCDIR)/checkstl.o: lib/checkstl.cpp lib/checkstl.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/executionpath.h lib/symboldatabase.h lib/mathlib.h $(SRCDIR)/checkstl.o: lib/checkstl.cpp lib/checkstl.h lib/config.h lib/check.h lib/token.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/standards.h lib/executionpath.h lib/symboldatabase.h lib/mathlib.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkstl.o $(SRCDIR)/checkstl.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_LIB} -c -o $(SRCDIR)/checkstl.o $(SRCDIR)/checkstl.cpp
@ -359,6 +369,9 @@ test/testassignif.o: test/testassignif.cpp lib/tokenize.h lib/errorlogger.h lib/
test/testautovariables.o: test/testautovariables.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkautovariables.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h test/testautovariables.o: test/testautovariables.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkautovariables.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testautovariables.o test/testautovariables.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testautovariables.o test/testautovariables.cpp
test/testbool.o: test/testbool.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkbool.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testbool.o test/testbool.cpp
test/testboost.o: test/testboost.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkboost.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h test/testboost.o: test/testboost.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkboost.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testboost.o test/testboost.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testboost.o test/testboost.cpp
@ -443,6 +456,9 @@ test/testrunner.o: test/testrunner.cpp test/testsuite.h lib/errorlogger.h lib/co
test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h lib/errorlogger.h lib/config.h lib/suppressions.h test/redirect.h lib/tokenize.h lib/tokenlist.h lib/token.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/path.h test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h lib/errorlogger.h lib/config.h lib/suppressions.h test/redirect.h lib/tokenize.h lib/tokenlist.h lib/token.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/path.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp
test/testsizeof.o: test/testsizeof.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checksizeof.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/testsizeof.o test/testsizeof.cpp
test/teststl.o: test/teststl.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkstl.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h test/teststl.o: test/teststl.cpp lib/tokenize.h lib/errorlogger.h lib/config.h lib/suppressions.h lib/tokenlist.h lib/checkstl.h lib/check.h lib/token.h lib/settings.h lib/standards.h test/testsuite.h test/redirect.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/teststl.o test/teststl.cpp $(CXX) $(CPPFLAGS) $(CXXFLAGS) ${INCLUDE_FOR_TEST} -c -o test/teststl.o test/teststl.cpp

4
lib/lib.pri
View File

@ -6,6 +6,7 @@ HEADERS += $${BASEPATH}check.h \
$${BASEPATH}check64bit.h \ $${BASEPATH}check64bit.h \
$${BASEPATH}checkassignif.h \ $${BASEPATH}checkassignif.h \
$${BASEPATH}checkautovariables.h \ $${BASEPATH}checkautovariables.h \
$${BASEPATH}checkbool.h \
$${BASEPATH}checkboost.h \ $${BASEPATH}checkboost.h \
$${BASEPATH}checkbufferoverrun.h \ $${BASEPATH}checkbufferoverrun.h \
$${BASEPATH}checkclass.h \ $${BASEPATH}checkclass.h \
@ -19,6 +20,7 @@ HEADERS += $${BASEPATH}check.h \
$${BASEPATH}checkobsoletefunctions.h \ $${BASEPATH}checkobsoletefunctions.h \
$${BASEPATH}checkother.h \ $${BASEPATH}checkother.h \
$${BASEPATH}checkpostfixoperator.h \ $${BASEPATH}checkpostfixoperator.h \
$${BASEPATH}checksizeof.h \
$${BASEPATH}checkstl.h \ $${BASEPATH}checkstl.h \
$${BASEPATH}checkuninitvar.h \ $${BASEPATH}checkuninitvar.h \
$${BASEPATH}checkunusedfunctions.h \ $${BASEPATH}checkunusedfunctions.h \
@ -42,6 +44,7 @@ HEADERS += $${BASEPATH}check.h \
SOURCES += $${BASEPATH}check64bit.cpp \ SOURCES += $${BASEPATH}check64bit.cpp \
$${BASEPATH}checkassignif.cpp \ $${BASEPATH}checkassignif.cpp \
$${BASEPATH}checkautovariables.cpp \ $${BASEPATH}checkautovariables.cpp \
$${BASEPATH}checkbool.cpp \
$${BASEPATH}checkboost.cpp \ $${BASEPATH}checkboost.cpp \
$${BASEPATH}checkbufferoverrun.cpp \ $${BASEPATH}checkbufferoverrun.cpp \
$${BASEPATH}checkclass.cpp \ $${BASEPATH}checkclass.cpp \
@ -55,6 +58,7 @@ SOURCES += $${BASEPATH}check64bit.cpp \
$${BASEPATH}checkobsoletefunctions.cpp \ $${BASEPATH}checkobsoletefunctions.cpp \
$${BASEPATH}checkother.cpp \ $${BASEPATH}checkother.cpp \
$${BASEPATH}checkpostfixoperator.cpp \ $${BASEPATH}checkpostfixoperator.cpp \
$${BASEPATH}checksizeof.cpp \
$${BASEPATH}checkstl.cpp \ $${BASEPATH}checkstl.cpp \
$${BASEPATH}checkuninitvar.cpp \ $${BASEPATH}checkuninitvar.cpp \
$${BASEPATH}checkunusedfunctions.cpp \ $${BASEPATH}checkunusedfunctions.cpp \

10
test/testbool.cpp
View File

@ -74,17 +74,7 @@ private:
// Check... // Check...
CheckBool checkBool(&tokenizer, &settings, this); CheckBool checkBool(&tokenizer, &settings, this);
checkBool.runChecks(&tokenizer, &settings, this); checkBool.runChecks(&tokenizer, &settings, this);
// Simplify token list..
const std::string str1(tokenizer.tokens()->stringifyList(0,true));
tokenizer.simplifyTokenList(); tokenizer.simplifyTokenList();
const std::string str2(tokenizer.tokens()->stringifyList(0,true));
if (str1 != str2)
warn(("Unsimplified code in test case. It looks like this test "
"should either be cleaned up or moved to TestTokenizer or "
"TestSimplifyTokens instead.\nstr1="+str1+"\nstr2="+str2).c_str());
checkBool.runSimplifiedChecks(&tokenizer, &settings, this); checkBool.runSimplifiedChecks(&tokenizer, &settings, this);
} }

2
test/testfiles.pri
View File

@ -6,6 +6,7 @@ INCLUDEPATH += ../externals/tinyxml
SOURCES += $${BASEPATH}/test64bit.cpp \ SOURCES += $${BASEPATH}/test64bit.cpp \
$${BASEPATH}/testassignif.cpp \ $${BASEPATH}/testassignif.cpp \
$${BASEPATH}/testautovariables.cpp \ $${BASEPATH}/testautovariables.cpp \
$${BASEPATH}/testbool.cpp \
$${BASEPATH}/testboost.cpp \ $${BASEPATH}/testboost.cpp \
$${BASEPATH}/testbufferoverrun.cpp \ $${BASEPATH}/testbufferoverrun.cpp \
$${BASEPATH}/testcharvar.cpp \ $${BASEPATH}/testcharvar.cpp \
@ -34,6 +35,7 @@ SOURCES += $${BASEPATH}/test64bit.cpp \
$${BASEPATH}/testpreprocessor.cpp \ $${BASEPATH}/testpreprocessor.cpp \
$${BASEPATH}/testrunner.cpp \ $${BASEPATH}/testrunner.cpp \
$${BASEPATH}/testsimplifytokens.cpp \ $${BASEPATH}/testsimplifytokens.cpp \
$${BASEPATH}/testsizeof.cpp \
$${BASEPATH}/teststl.cpp \ $${BASEPATH}/teststl.cpp \
$${BASEPATH}/testsuite.cpp \ $${BASEPATH}/testsuite.cpp \
$${BASEPATH}/testsuppressions.cpp \ $${BASEPATH}/testsuppressions.cpp \