From 216dd1a2fb53fad536125690617e8eebb2ad0699 Mon Sep 17 00:00:00 2001 From: Theron Tock Date: Wed, 11 May 2011 14:05:18 -0700 Subject: [PATCH] Make sure DEPENDPATH has same stuff as INCLUDEPATH, otherwise when files change in other directories the dependent files don't get recompiled. Fixed up INCLUDEPATH in various places. Removed -pthread as an INCLUDEPATH (leads to bogus -I-pthread). --- qmake.inc.in | 2 +- src/antlr/antlr.pro | 1 + src/cisco_lib/cisco_lib.pro | 1 + src/common/common.pro | 1 + src/compiler_lib/compiler_lib.pro | 1 + src/fwbedit/fwbedit.pro | 7 ++---- src/fwtransfer/fwtransfer.pro | 1 + src/gui/gui.pro | 20 +++++------------ src/import/import.pro | 3 ++- src/iosacl/iosacl.pro | 3 ++- src/ipf/ipf.pro | 5 ++--- src/ipfw/ipfw.pro | 5 ++--- src/ipt/ipt.pro | 5 ++--- src/iptlib/iptlib.pro | 5 ++--- src/libfwbuilder/qmake.inc.in | 4 +++- src/libgui/libgui.pro | 15 +++++-------- src/parsers/parsers.pro | 3 ++- src/pf/pf.pro | 5 ++--- src/pflib/pflib.pro | 1 + src/pix/pix.pro | 3 ++- src/procurve_acl/procurve_acl.pro | 3 ++- src/transfer_agents/secuwall/secuwall.pro | 1 + .../AddressTableTest/AddressTableTest.pro | 1 + src/unit_tests/DNSTest/DNSTest.pro | 1 + src/unit_tests/FWObjectTest/FWObjectTest.pro | 1 + .../Inet6AddrMaskTest/Inet6AddrMaskTest.pro | 1 + .../InetAddrMaskTest/InetAddrMaskTest.pro | 1 + .../ObjectMatcherTest/ObjectMatcherTest.pro | 1 + src/unit_tests/main/main.pro | 22 +++++++++++++------ src/unit_tests/tests_common.pri | 18 +++++++++++++-- 30 files changed, 81 insertions(+), 60 deletions(-) diff --git a/qmake.inc.in b/qmake.inc.in index 359f861d1..6bf27e005 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -28,7 +28,7 @@ unix { QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX INCLUDEPATH += .. ../.. - INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@ + INCLUDEPATH += @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@ UI_DIR = .ui diff --git a/src/antlr/antlr.pro b/src/antlr/antlr.pro index 716c85004..a225e1143 100644 --- a/src/antlr/antlr.pro +++ b/src/antlr/antlr.pro @@ -91,6 +91,7 @@ HEADERS = ANTLRException.hpp \ CONFIG += staticlib INCLUDEPATH += $$ANTLR_INCLUDEPATH +DEPENDPATH += $$ANTLR_INCLUDEPATH DEFINES += $$ANTLR_DEFINES TARGET = antlr diff --git a/src/cisco_lib/cisco_lib.pro b/src/cisco_lib/cisco_lib.pro index ed7fc3645..e7be7b572 100644 --- a/src/cisco_lib/cisco_lib.pro +++ b/src/cisco_lib/cisco_lib.pro @@ -99,6 +99,7 @@ HEADERS = ../../config.h \ macx:LIBS += $$LIBS_FWCOMPILER INCLUDEPATH += ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../compiler_lib ../libfwbuilder/src win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a diff --git a/src/common/common.pro b/src/common/common.pro index dd93a4e86..c30a904bc 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -13,6 +13,7 @@ SOURCES = init.cpp HEADERS = ../../config.h commoninit.h INCLUDEPATH += ../libfwbuilder/src +DEPENDPATH += ../libfwbuilder/src CONFIG += staticlib diff --git a/src/compiler_lib/compiler_lib.pro b/src/compiler_lib/compiler_lib.pro index ec33db6ee..040d07255 100644 --- a/src/compiler_lib/compiler_lib.pro +++ b/src/compiler_lib/compiler_lib.pro @@ -36,6 +36,7 @@ HEADERS = ../../config.h \ AutomaticRules.h INCLUDEPATH += ../libfwbuilder/src +DEPENDPATH += ../libfwbuilder/src CONFIG += staticlib diff --git a/src/fwbedit/fwbedit.pro b/src/fwbedit/fwbedit.pro index 25b9174db..048c87c97 100644 --- a/src/fwbedit/fwbedit.pro +++ b/src/fwbedit/fwbedit.pro @@ -10,7 +10,8 @@ QT += network SOURCES = fwbedit.cpp new_object.cpp repair_tree.cpp list_object.cpp merge.cpp import.cpp HEADERS = ../../config.h fwbedit.h upgradePredicate.h -INCLUDEPATH += ../libfwbuilder/src ../import ../compiler_lib/ ../libgui +INCLUDEPATH += ../libfwbuilder/src ../import ../compiler_lib ../libgui +DEPENDPATH += ../libfwbuilder/src ../import ../compiler_lib ../libgui win32:INCLUDEPATH += ../libgui/ui !win32:INCLUDEPATH += ../libgui/.ui @@ -21,10 +22,6 @@ TARGET = fwbedit QMAKE_COPY = ../../install.sh -m 0755 -s } -DEPENDPATH = ../common \ - ../libfwbuilder/src/fwbuilder \ - ../libfwbuilder/src/fwcompiler - !win32:LIBS = ../common/libcommon.a \ ../import/libimport.a \ ../parsers/libfwbparser.a \ diff --git a/src/fwtransfer/fwtransfer.pro b/src/fwtransfer/fwtransfer.pro index cc5c30b69..290d2a334 100644 --- a/src/fwtransfer/fwtransfer.pro +++ b/src/fwtransfer/fwtransfer.pro @@ -5,6 +5,7 @@ include(../../qmake.inc) TEMPLATE = lib # INCLUDEPATH += ../libfwbuilder/src +DEPENDPATH += ../libfwbuilder/src SOURCES = TransferDevice.cpp diff --git a/src/gui/gui.pro b/src/gui/gui.pro index bec18fe9e..976d7f62c 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -39,29 +39,19 @@ contains( HAVE_QTDBUS, 1 ):unix { } # !macx:STATIC_LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0 + INCLUDEPATH += \ - ../common \ - ../import \ - ../iptlib \ - ../pflib \ - ../cisco_lib/ \ - ../compiler_lib/ \ ../libgui \ + ../compiler_lib \ ../libfwbuilder/src win32:INCLUDEPATH += ../libgui/ui !win32:INCLUDEPATH += ../libgui/.ui -DEPENDPATH = \ - ../common \ - ../import \ - ../iptlib \ - ../pflib \ - ../cisco_lib/ \ - ../compiler_lib \ +DEPENDPATH += \ ../libgui \ - ../libfwbuilder/src/fwbuilder \ - ../libfwbuilder/src/fwcompiler + ../compiler_lib \ + ../libfwbuilder/src win32:STATIC_LIBS += \ ../common/release/common.lib \ diff --git a/src/import/import.pro b/src/import/import.pro index 875f57c53..54dc3aace 100644 --- a/src/import/import.pro +++ b/src/import/import.pro @@ -35,7 +35,8 @@ HEADERS = QStringListOperators.h \ CONFIG += staticlib -INCLUDEPATH += $$ANTLR_INCLUDEPATH ../compiler_lib ../parsers ../libfwbuilder/src/ +INCLUDEPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib +DEPENDPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib LIBS += $$ANTLR_LIBS DEFINES += $$ANTLR_DEFINES diff --git a/src/iosacl/iosacl.pro b/src/iosacl/iosacl.pro index 380a363c2..f96e86bd9 100644 --- a/src/iosacl/iosacl.pro +++ b/src/iosacl/iosacl.pro @@ -18,7 +18,8 @@ HEADERS = ../../config.h win32:CONFIG += console -INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src +INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../cisco_lib/release/fwbcisco.lib \ diff --git a/src/ipf/ipf.pro b/src/ipf/ipf.pro index 83e34d6f2..968f3452f 100644 --- a/src/ipf/ipf.pro +++ b/src/ipf/ipf.pro @@ -14,9 +14,8 @@ win32:CONFIG += console # unix { !macx: CONFIG -= qt } -INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src - -DEPENDPATH = ../pflib +INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../pflib/release/fwbpf.lib \ diff --git a/src/ipfw/ipfw.pro b/src/ipfw/ipfw.pro index 5d6d469de..3874a1af2 100644 --- a/src/ipfw/ipfw.pro +++ b/src/ipfw/ipfw.pro @@ -12,9 +12,8 @@ HEADERS = ../../config.h win32:CONFIG += console -INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src - -DEPENDPATH = ../pflib +INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../pflib/release/fwbpf.lib \ diff --git a/src/ipt/ipt.pro b/src/ipt/ipt.pro index 6828d7284..d5bbfbaa5 100644 --- a/src/ipt/ipt.pro +++ b/src/ipt/ipt.pro @@ -12,9 +12,8 @@ HEADERS = ../../config.h win32: CONFIG += console -INCLUDEPATH += ../common ../iptlib ../compiler_lib/ ../libfwbuilder/src - -DEPENDPATH = ../common ../iptlib ../compiler_lib +INCLUDEPATH += ../iptlib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../iptlib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../iptlib/release/iptlib.lib \ diff --git a/src/iptlib/iptlib.pro b/src/iptlib/iptlib.pro index 36465b437..dd5296e5a 100644 --- a/src/iptlib/iptlib.pro +++ b/src/iptlib/iptlib.pro @@ -48,9 +48,8 @@ HEADERS = ../../config.h \ CONFIG += staticlib -INCLUDEPATH += ../compiler_lib/ ../libfwbuilder/src - -DEPENDPATH = ../compiler_lib +INCLUDEPATH += ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../compiler_lib ../libfwbuilder/src win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib \ ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \ diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in index db3191919..ce2b773d6 100644 --- a/src/libfwbuilder/qmake.inc.in +++ b/src/libfwbuilder/qmake.inc.in @@ -23,7 +23,9 @@ unix { QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX - INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ @PTHREAD_CFLAGS_Q@ + # We put /usr/include into INCLUDEPATH to fix a problem compiling + # fwbuilder/snmp.cpp on freebsd. + INCLUDEPATH += /usr/include @XML_CFLAGS_Q@ @XSLT_CFLAGS_Q@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@ QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter diff --git a/src/libgui/libgui.pro b/src/libgui/libgui.pro index 481778fb6..05db58174 100644 --- a/src/libgui/libgui.pro +++ b/src/libgui/libgui.pro @@ -568,26 +568,23 @@ FORMS = FWBMainWindow_q.ui \ HEADERS += transferDialog.h SOURCES += transferDialog.cpp FORMS += transferdialog_q.ui -INCLUDEPATH += $$ANTLR_INCLUDEPATH -DEFINES += $$ANTLR_DEFINES # !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0 -INCLUDEPATH += ../common \ + +INCLUDEPATH += \ ../import \ ../iptlib \ ../pflib \ - ../cisco_lib/ \ - ../compiler_lib/ \ + ../cisco_lib \ + ../compiler_lib \ ../libfwbuilder/src - -DEPENDPATH = ../common \ +DEPENDPATH += \ ../import \ ../iptlib \ ../pflib \ ../cisco_lib/ \ ../compiler_lib \ - ../libfwbuilder/src/fwbuilder \ - ../libfwbuilder/src/fwcompiler + ../libfwbuilder/src RESOURCES += MainRes.qrc diff --git a/src/parsers/parsers.pro b/src/parsers/parsers.pro index ac635f25d..42d2c16fc 100644 --- a/src/parsers/parsers.pro +++ b/src/parsers/parsers.pro @@ -25,7 +25,8 @@ HEADERS = ../../config.h \ CONFIG += staticlib -INCLUDEPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src/ +INCLUDEPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src +DEPENDPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src LIBS += $$ANTLR_LIBS DEFINES += $$ANTLR_DEFINES diff --git a/src/pf/pf.pro b/src/pf/pf.pro index 2b52cd0c5..a790b0185 100644 --- a/src/pf/pf.pro +++ b/src/pf/pf.pro @@ -12,9 +12,8 @@ HEADERS = ../../config.h win32:CONFIG += console -INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src/ - -DEPENDPATH = ../pflib +INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../pflib/release/fwbpf.lib \ diff --git a/src/pflib/pflib.pro b/src/pflib/pflib.pro index b02e331f8..db74c300d 100644 --- a/src/pflib/pflib.pro +++ b/src/pflib/pflib.pro @@ -64,6 +64,7 @@ HEADERS = ../../config.h \ macx:LIBS += $$LIBS_FWCOMPILER INCLUDEPATH += ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../compiler_lib ../libfwbuilder/src win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib diff --git a/src/pix/pix.pro b/src/pix/pix.pro index ddb823f84..2f6e44dc3 100644 --- a/src/pix/pix.pro +++ b/src/pix/pix.pro @@ -12,7 +12,8 @@ HEADERS = ../../config.h win32:CONFIG += console -INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src/ +INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../cisco_lib/release/fwbcisco.lib\ diff --git a/src/procurve_acl/procurve_acl.pro b/src/procurve_acl/procurve_acl.pro index 55f6f881c..feaaf6bd7 100644 --- a/src/procurve_acl/procurve_acl.pro +++ b/src/procurve_acl/procurve_acl.pro @@ -18,7 +18,8 @@ HEADERS = ../../config.h win32:CONFIG += console -INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src/ +INCLUDEPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src +DEPENDPATH += ../cisco_lib ../compiler_lib ../libfwbuilder/src win32:LIBS += ../common/release/common.lib \ ../cisco_lib/release/fwbcisco.lib \ diff --git a/src/transfer_agents/secuwall/secuwall.pro b/src/transfer_agents/secuwall/secuwall.pro index c6092c35d..12a5cc411 100644 --- a/src/transfer_agents/secuwall/secuwall.pro +++ b/src/transfer_agents/secuwall/secuwall.pro @@ -8,6 +8,7 @@ SOURCES = transfer_secuwall.cpp HEADERS = ../../../config.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src contains( HAVE_QTDBUS, 1 ):unix { !macx: QT += network dbus diff --git a/src/unit_tests/AddressTableTest/AddressTableTest.pro b/src/unit_tests/AddressTableTest/AddressTableTest.pro index 200010203..7f8cd1283 100644 --- a/src/unit_tests/AddressTableTest/AddressTableTest.pro +++ b/src/unit_tests/AddressTableTest/AddressTableTest.pro @@ -13,6 +13,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp AddressTableTest.cpp HEADERS += AddressTableTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/DNSTest/DNSTest.pro b/src/unit_tests/DNSTest/DNSTest.pro index c35b79ce1..6f8322147 100644 --- a/src/unit_tests/DNSTest/DNSTest.pro +++ b/src/unit_tests/DNSTest/DNSTest.pro @@ -13,6 +13,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp DNSTest.cpp HEADERS += DNSTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/FWObjectTest/FWObjectTest.pro b/src/unit_tests/FWObjectTest/FWObjectTest.pro index 9610ddd37..712c07722 100644 --- a/src/unit_tests/FWObjectTest/FWObjectTest.pro +++ b/src/unit_tests/FWObjectTest/FWObjectTest.pro @@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp FWObjectTest.cpp HEADERS += FWObjectTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro b/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro index 046d9c894..acc3023b4 100644 --- a/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro +++ b/src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro @@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp Inet6AddrMaskTest.cpp HEADERS += Inet6AddrMaskTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro b/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro index ef3d3ca50..09305fae0 100644 --- a/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro +++ b/src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro @@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp InetAddrMaskTest.cpp HEADERS += InetAddrMaskTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro index fb06fc7bc..52196c601 100644 --- a/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro +++ b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro @@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS SOURCES += main.cpp ObjectMatcherTest.cpp HEADERS += ObjectMatcherTest.h INCLUDEPATH += ../../libfwbuilder/src +DEPENDPATH += ../../libfwbuilder/src LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.depends = all diff --git a/src/unit_tests/main/main.pro b/src/unit_tests/main/main.pro index 5289ba08b..e0b531b6d 100644 --- a/src/unit_tests/main/main.pro +++ b/src/unit_tests/main/main.pro @@ -10,13 +10,21 @@ QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS CONFIG -= release CONFIG += debug -INCLUDEPATH += ../../.. -INCLUDEPATH += ../.. -INCLUDEPATH += ../../libfwbuilder/src -INCLUDEPATH += ../../libgui -INCLUDEPATH += ../../libgui/.ui -INCLUDEPATH += ../../compiler_lib -INCLUDEPATH += ../../common +INCLUDEPATH += ../../.. \ + ../.. \ + ../../libfwbuilder/src \ + ../../libgui \ + ../../libgui/.ui \ + ../../compiler_lib \ + ../../common + +DEPENDPATH += ../../.. \ + ../.. \ + ../../libfwbuilder/src \ + ../../libgui \ + ../../libgui/.ui \ + ../../compiler_lib \ + ../../common QT += testlib network gui diff --git a/src/unit_tests/tests_common.pri b/src/unit_tests/tests_common.pri index a9a382771..290624660 100644 --- a/src/unit_tests/tests_common.pri +++ b/src/unit_tests/tests_common.pri @@ -15,12 +15,25 @@ INCLUDEPATH += ../../.. \ ../../common \ ../../parsers \ ../../import \ - ../../compiler_lib/ \ + ../../compiler_lib \ ../../libgui \ ../../libgui/.ui \ ../../iptlib \ ../../pflib \ - ../../cisco_lib/ \ + ../../cisco_lib \ + ../../libfwbuilder/src + +DEPENDPATH += ../../.. \ + ../.. \ + ../../common \ + ../../parsers \ + ../../import \ + ../../compiler_lib \ + ../../libgui \ + ../../libgui/.ui \ + ../../iptlib \ + ../../pflib \ + ../../cisco_lib \ ../../libfwbuilder/src run_tests.commands = echo "Running tests..."; ./${TARGET} @@ -30,6 +43,7 @@ clean_tests.depends = clean QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests INCLUDEPATH += $$ANTLR_INCLUDEPATH +DEPENDPATH += $$ANTLR_INCLUDEPATH DEFINES += $$ANTLR_DEFINES # fwtransfer lib. Add this before adding -lQtDBus to LIBS below