fixed qmake building with new folder structure

Daniel Marjamäki · Daniel Marjamäki · commit d4f706e040be · 2009-10-25T19:29:10.000+01:00
diff --git a/Makefile b/Makefile
@@ -16,17 +16,17 @@ LIBOBJ =     lib/checkautovariables.o \
               lib/checkstl.o \
               lib/checkunusedfunctions.o \
               lib/cppcheck.o \
+              lib/cppcheckexecutor.o \
               lib/errorlogger.o \
               lib/filelister.o \
               lib/mathlib.o \
               lib/preprocessor.o \
               lib/settings.o \
+              lib/threadexecutor.o \
               lib/token.o \
               lib/tokenize.o
 
-CLIOBJ =     cli/cppcheckexecutor.o \
-              cli/main.o \
-              cli/threadexecutor.o
+CLIOBJ =     cli/main.o
 
 TESTOBJ =     test/testautovariables.o \
               test/testbufferoverrun.o \
@@ -74,7 +74,7 @@ tools/dmake:	tools/dmake.cpp	lib/filelister.cpp	lib/filelister.h
 	$(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp lib/filelister.cpp $(LDFLAGS)
 
 clean:
-	rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg
+	rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake
 
 install:	cppcheck
 	install -d ${BIN}
@@ -116,6 +116,9 @@ lib/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/checkunusedfunction
 lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/preprocessor.h lib/filelister.h lib/check.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheck.o lib/cppcheck.cpp
 
+lib/cppcheckexecutor.o: lib/cppcheckexecutor.cpp lib/cppcheckexecutor.h lib/errorlogger.h lib/settings.h lib/cppcheck.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/threadexecutor.h
+	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheckexecutor.o lib/cppcheckexecutor.cpp
+
 lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/settings.h lib/tokenize.h lib/classinfo.h lib/token.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/errorlogger.o lib/errorlogger.cpp
 
@@ -131,21 +134,18 @@ lib/preprocessor.o: lib/preprocessor.cpp lib/preprocessor.h lib/errorlogger.h li
 lib/settings.o: lib/settings.cpp lib/settings.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/settings.o lib/settings.cpp
 
+lib/threadexecutor.o: lib/threadexecutor.cpp lib/threadexecutor.h lib/settings.h lib/errorlogger.h lib/cppcheck.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h
+	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/threadexecutor.o lib/threadexecutor.cpp
+
 lib/token.o: lib/token.cpp lib/token.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/token.o lib/token.cpp
 
 lib/tokenize.o: lib/tokenize.cpp lib/tokenize.h lib/classinfo.h lib/token.h lib/filelister.h lib/mathlib.h lib/settings.h lib/errorlogger.h lib/check.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/tokenize.o lib/tokenize.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cppcheckexecutor.h cli/threadexecutor.h
-	$(CXX) $(CXXFLAGS) -Ilib -c -o cli/cppcheckexecutor.o cli/cppcheckexecutor.cpp
-
-cli/main.o: cli/main.cpp cli/cppcheckexecutor.h
+cli/main.o: cli/main.cpp lib/cppcheckexecutor.h lib/errorlogger.h lib/settings.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o cli/main.o cli/main.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/threadexecutor.h
-	$(CXX) $(CXXFLAGS) -Ilib -c -o cli/threadexecutor.o cli/threadexecutor.cpp
-
 test/testautovariables.o: test/testautovariables.cpp test/testsuite.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o test/testautovariables.o test/testautovariables.cpp
 
diff --git a/cli/cli.pro b/cli/cli.pro
@@ -6,7 +6,8 @@ OBJECTS_DIR = temp
 CONFIG += warn_on
 CONFIG -= qt app_bundle
 
-include($$PWD/src.pri)
+include($$PWD/../lib/lib.pri)
+
 SOURCES += main.cpp
 
 win32 {
diff --git a/cli/main.cpp b/cli/main.cpp
@@ -82,7 +82,7 @@ void CheckOther::checkZeroDivision()
  */
 
 
-#include "cppcheckexecutor.h"
+#include "../lib/cppcheckexecutor.h"
 
 /**
  * Main function of cppcheck
diff --git a/gui/checkthread.h b/gui/checkthread.h
@@ -21,8 +21,8 @@
 #define CHECKTHREAD_H
 
 #include <QThread>
-#include "../src/cppcheck.h"
-#include "../src/settings.h"
+#include "../lib/cppcheck.h"
+#include "../lib/settings.h"
 #include "threadresult.h"
 
 /// @addtogroup GUI
diff --git a/gui/gui.pro b/gui/gui.pro
@@ -27,7 +27,7 @@ TRANSLATIONS =  cppcheck_fi.ts \
 # Windows-specific options
 CONFIG += embed_manifest_exe
 
-include($$PWD/../src/src.pri)
+include($$PWD/../lib/lib.pri)
 HEADERS += mainwindow.h \
            checkthread.h \
            resultsview.h \
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -32,8 +32,8 @@
 #include "fileviewdialog.h"
 #include "projectfile.h"
 #include "report.h"
-#include "../src/filelister.h"
-#include "../src/cppcheckexecutor.h"
+#include "../lib/filelister.h"
+#include "../lib/cppcheckexecutor.h"
 
 MainWindow::MainWindow() :
         mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)),
diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -23,7 +23,7 @@
 
 #include <QWidget>
 #include <QProgressBar>
-#include "../src/errorlogger.h"
+#include "../lib/errorlogger.h"
 #include "resultstree.h"
 #include "common.h"
 #include "report.h"
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
@@ -22,8 +22,8 @@
 
 #include <QObject>
 #include <QStringList>
-#include "../src/settings.h"
-#include "../src/cppcheck.h"
+#include "../lib/settings.h"
+#include "../lib/cppcheck.h"
 #include "threadresult.h"
 #include "checkthread.h"
 #include "resultsview.h"
diff --git a/gui/threadresult.h b/gui/threadresult.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QStringList>
 #include <QVariant>
-#include "../src/errorlogger.h"
+#include "../lib/errorlogger.h"
 
 /// @addtogroup GUI
 /// @{
diff --git a/lib/cppcheckexecutor.cpp b/lib/cppcheckexecutor.cpp
diff --git a/lib/cppcheckexecutor.h b/lib/cppcheckexecutor.h
diff --git a/lib/lib.pri b/lib/lib.pri
@@ -5,6 +5,7 @@ HEADERS += $$PWD/check.h \
            $$PWD/checkbufferoverrun.h \
            $$PWD/checkclass.h \
            $$PWD/checkdangerousfunctions.h \
+           $$PWD/checkexceptionsafety.h \
            $$PWD/checkheaders.h \
            $$PWD/checkmemoryleak.h \
            $$PWD/checkother.h \
@@ -28,6 +29,7 @@ SOURCES += $$PWD/checkautovariables.cpp \
            $$PWD/checkbufferoverrun.cpp \
            $$PWD/checkclass.cpp \
            $$PWD/checkdangerousfunctions.cpp \
+           $$PWD/checkexceptionsafety.cpp \
            $$PWD/checkheaders.cpp \
            $$PWD/checkmemoryleak.cpp \
            $$PWD/checkother.cpp \
diff --git a/lib/threadexecutor.cpp b/lib/threadexecutor.cpp
diff --git a/lib/threadexecutor.h b/lib/threadexecutor.h
