1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-06-25 02:19:37 +02:00

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).
This commit is contained in:
Theron Tock
2011-05-11 14:05:18 -07:00
parent 4880424bf3
commit 216dd1a2fb
30 changed files with 81 additions and 60 deletions

View File

@@ -28,7 +28,7 @@ unix {
QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
INCLUDEPATH += .. ../.. 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@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@
UI_DIR = .ui UI_DIR = .ui

View File

@@ -91,6 +91,7 @@ HEADERS = ANTLRException.hpp \
CONFIG += staticlib CONFIG += staticlib
INCLUDEPATH += $$ANTLR_INCLUDEPATH INCLUDEPATH += $$ANTLR_INCLUDEPATH
DEPENDPATH += $$ANTLR_INCLUDEPATH
DEFINES += $$ANTLR_DEFINES DEFINES += $$ANTLR_DEFINES
TARGET = antlr TARGET = antlr

View File

@@ -99,6 +99,7 @@ HEADERS = ../../config.h \
macx:LIBS += $$LIBS_FWCOMPILER macx:LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../compiler_lib ../libfwbuilder/src INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../compiler_lib ../libfwbuilder/src
win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib
!win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a

View File

@@ -13,6 +13,7 @@ SOURCES = init.cpp
HEADERS = ../../config.h commoninit.h HEADERS = ../../config.h commoninit.h
INCLUDEPATH += ../libfwbuilder/src INCLUDEPATH += ../libfwbuilder/src
DEPENDPATH += ../libfwbuilder/src
CONFIG += staticlib CONFIG += staticlib

View File

@@ -36,6 +36,7 @@ HEADERS = ../../config.h \
AutomaticRules.h AutomaticRules.h
INCLUDEPATH += ../libfwbuilder/src INCLUDEPATH += ../libfwbuilder/src
DEPENDPATH += ../libfwbuilder/src
CONFIG += staticlib CONFIG += staticlib

View File

@@ -10,7 +10,8 @@ QT += network
SOURCES = fwbedit.cpp new_object.cpp repair_tree.cpp list_object.cpp merge.cpp import.cpp SOURCES = fwbedit.cpp new_object.cpp repair_tree.cpp list_object.cpp merge.cpp import.cpp
HEADERS = ../../config.h fwbedit.h upgradePredicate.h 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
!win32:INCLUDEPATH += ../libgui/.ui !win32:INCLUDEPATH += ../libgui/.ui
@@ -21,10 +22,6 @@ TARGET = fwbedit
QMAKE_COPY = ../../install.sh -m 0755 -s QMAKE_COPY = ../../install.sh -m 0755 -s
} }
DEPENDPATH = ../common \
../libfwbuilder/src/fwbuilder \
../libfwbuilder/src/fwcompiler
!win32:LIBS = ../common/libcommon.a \ !win32:LIBS = ../common/libcommon.a \
../import/libimport.a \ ../import/libimport.a \
../parsers/libfwbparser.a \ ../parsers/libfwbparser.a \

View File

@@ -5,6 +5,7 @@ include(../../qmake.inc)
TEMPLATE = lib TEMPLATE = lib
# #
INCLUDEPATH += ../libfwbuilder/src INCLUDEPATH += ../libfwbuilder/src
DEPENDPATH += ../libfwbuilder/src
SOURCES = TransferDevice.cpp SOURCES = TransferDevice.cpp

View File

@@ -39,29 +39,19 @@ contains( HAVE_QTDBUS, 1 ):unix {
} }
# !macx:STATIC_LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0 # !macx:STATIC_LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += \ INCLUDEPATH += \
../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \
../compiler_lib/ \
../libgui \ ../libgui \
../compiler_lib \
../libfwbuilder/src ../libfwbuilder/src
win32:INCLUDEPATH += ../libgui/ui win32:INCLUDEPATH += ../libgui/ui
!win32:INCLUDEPATH += ../libgui/.ui !win32:INCLUDEPATH += ../libgui/.ui
DEPENDPATH = \ DEPENDPATH += \
../common \
../import \
../iptlib \
../pflib \
../cisco_lib/ \
../compiler_lib \
../libgui \ ../libgui \
../libfwbuilder/src/fwbuilder \ ../compiler_lib \
../libfwbuilder/src/fwcompiler ../libfwbuilder/src
win32:STATIC_LIBS += \ win32:STATIC_LIBS += \
../common/release/common.lib \ ../common/release/common.lib \

View File

@@ -35,7 +35,8 @@ HEADERS = QStringListOperators.h \
CONFIG += staticlib 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 LIBS += $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES DEFINES += $$ANTLR_DEFINES

View File

@@ -18,7 +18,8 @@ HEADERS = ../../config.h
win32:CONFIG += console 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 \ win32:LIBS += ../common/release/common.lib \
../cisco_lib/release/fwbcisco.lib \ ../cisco_lib/release/fwbcisco.lib \

View File

@@ -14,9 +14,8 @@ win32:CONFIG += console
# unix { !macx: CONFIG -= qt } # unix { !macx: CONFIG -= qt }
INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../pflib
win32:LIBS += ../common/release/common.lib \ win32:LIBS += ../common/release/common.lib \
../pflib/release/fwbpf.lib \ ../pflib/release/fwbpf.lib \

View File

@@ -12,9 +12,8 @@ HEADERS = ../../config.h
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../pflib
win32:LIBS += ../common/release/common.lib \ win32:LIBS += ../common/release/common.lib \
../pflib/release/fwbpf.lib \ ../pflib/release/fwbpf.lib \

View File

@@ -12,9 +12,8 @@ HEADERS = ../../config.h
win32: CONFIG += console win32: CONFIG += console
INCLUDEPATH += ../common ../iptlib ../compiler_lib/ ../libfwbuilder/src INCLUDEPATH += ../iptlib ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../iptlib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../common ../iptlib ../compiler_lib
win32:LIBS += ../common/release/common.lib \ win32:LIBS += ../common/release/common.lib \
../iptlib/release/iptlib.lib \ ../iptlib/release/iptlib.lib \

View File

@@ -48,9 +48,8 @@ HEADERS = ../../config.h \
CONFIG += staticlib CONFIG += staticlib
INCLUDEPATH += ../compiler_lib/ ../libfwbuilder/src INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../compiler_lib
win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib \ win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib \
../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \ ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \

View File

@@ -23,7 +23,9 @@ unix {
QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX 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@ LIBS += @PTHREAD_LIBS@ @XML_LIBS@ @XSLT_LIBS@ @LIBSNMP_LIBS@ @LIB_RESOLV@ @LIBS@
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter

View File

@@ -568,26 +568,23 @@ FORMS = FWBMainWindow_q.ui \
HEADERS += transferDialog.h HEADERS += transferDialog.h
SOURCES += transferDialog.cpp SOURCES += transferDialog.cpp
FORMS += transferdialog_q.ui FORMS += transferdialog_q.ui
INCLUDEPATH += $$ANTLR_INCLUDEPATH
DEFINES += $$ANTLR_DEFINES
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0 # !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += ../common \
INCLUDEPATH += \
../import \ ../import \
../iptlib \ ../iptlib \
../pflib \ ../pflib \
../cisco_lib/ \ ../cisco_lib \
../compiler_lib/ \ ../compiler_lib \
../libfwbuilder/src ../libfwbuilder/src
DEPENDPATH += \
DEPENDPATH = ../common \
../import \ ../import \
../iptlib \ ../iptlib \
../pflib \ ../pflib \
../cisco_lib/ \ ../cisco_lib/ \
../compiler_lib \ ../compiler_lib \
../libfwbuilder/src/fwbuilder \ ../libfwbuilder/src
../libfwbuilder/src/fwcompiler
RESOURCES += MainRes.qrc RESOURCES += MainRes.qrc

View File

@@ -25,7 +25,8 @@ HEADERS = ../../config.h \
CONFIG += staticlib CONFIG += staticlib
INCLUDEPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src/ INCLUDEPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src
DEPENDPATH += $$ANTLR_INCLUDEPATH ../import ../libfwbuilder/src
LIBS += $$ANTLR_LIBS LIBS += $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES DEFINES += $$ANTLR_DEFINES

View File

@@ -12,9 +12,8 @@ HEADERS = ../../config.h
win32:CONFIG += console win32:CONFIG += console
INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src/ INCLUDEPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../pflib
win32:LIBS += ../common/release/common.lib \ win32:LIBS += ../common/release/common.lib \
../pflib/release/fwbpf.lib \ ../pflib/release/fwbpf.lib \

View File

@@ -64,6 +64,7 @@ HEADERS = ../../config.h \
macx:LIBS += $$LIBS_FWCOMPILER macx:LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../compiler_lib ../libfwbuilder/src INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
DEPENDPATH += ../compiler_lib ../libfwbuilder/src
win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib

View File

@@ -12,7 +12,8 @@ HEADERS = ../../config.h
win32:CONFIG += console 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 \ win32:LIBS += ../common/release/common.lib \
../cisco_lib/release/fwbcisco.lib\ ../cisco_lib/release/fwbcisco.lib\

View File

@@ -18,7 +18,8 @@ HEADERS = ../../config.h
win32:CONFIG += console 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 \ win32:LIBS += ../common/release/common.lib \
../cisco_lib/release/fwbcisco.lib \ ../cisco_lib/release/fwbcisco.lib \

View File

@@ -8,6 +8,7 @@ SOURCES = transfer_secuwall.cpp
HEADERS = ../../../config.h HEADERS = ../../../config.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
contains( HAVE_QTDBUS, 1 ):unix { contains( HAVE_QTDBUS, 1 ):unix {
!macx: QT += network dbus !macx: QT += network dbus

View File

@@ -13,6 +13,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp AddressTableTest.cpp SOURCES += main.cpp AddressTableTest.cpp
HEADERS += AddressTableTest.h HEADERS += AddressTableTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -13,6 +13,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp DNSTest.cpp SOURCES += main.cpp DNSTest.cpp
HEADERS += DNSTest.h HEADERS += DNSTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp FWObjectTest.cpp SOURCES += main.cpp FWObjectTest.cpp
HEADERS += FWObjectTest.h HEADERS += FWObjectTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp Inet6AddrMaskTest.cpp SOURCES += main.cpp Inet6AddrMaskTest.cpp
HEADERS += Inet6AddrMaskTest.h HEADERS += Inet6AddrMaskTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp InetAddrMaskTest.cpp SOURCES += main.cpp InetAddrMaskTest.cpp
HEADERS += InetAddrMaskTest.h HEADERS += InetAddrMaskTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -12,6 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp ObjectMatcherTest.cpp SOURCES += main.cpp ObjectMatcherTest.cpp
HEADERS += ObjectMatcherTest.h HEADERS += ObjectMatcherTest.h
INCLUDEPATH += ../../libfwbuilder/src INCLUDEPATH += ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET} run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all run_tests.depends = all

View File

@@ -10,13 +10,21 @@ QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
CONFIG -= release CONFIG -= release
CONFIG += debug CONFIG += debug
INCLUDEPATH += ../../.. INCLUDEPATH += ../../.. \
INCLUDEPATH += ../.. ../.. \
INCLUDEPATH += ../../libfwbuilder/src ../../libfwbuilder/src \
INCLUDEPATH += ../../libgui ../../libgui \
INCLUDEPATH += ../../libgui/.ui ../../libgui/.ui \
INCLUDEPATH += ../../compiler_lib ../../compiler_lib \
INCLUDEPATH += ../../common ../../common
DEPENDPATH += ../../.. \
../.. \
../../libfwbuilder/src \
../../libgui \
../../libgui/.ui \
../../compiler_lib \
../../common
QT += testlib network gui QT += testlib network gui

View File

@@ -15,12 +15,25 @@ INCLUDEPATH += ../../.. \
../../common \ ../../common \
../../parsers \ ../../parsers \
../../import \ ../../import \
../../compiler_lib/ \ ../../compiler_lib \
../../libgui \ ../../libgui \
../../libgui/.ui \ ../../libgui/.ui \
../../iptlib \ ../../iptlib \
../../pflib \ ../../pflib \
../../cisco_lib/ \ ../../cisco_lib \
../../libfwbuilder/src
DEPENDPATH += ../../.. \
../.. \
../../common \
../../parsers \
../../import \
../../compiler_lib \
../../libgui \
../../libgui/.ui \
../../iptlib \
../../pflib \
../../cisco_lib \
../../libfwbuilder/src ../../libfwbuilder/src
run_tests.commands = echo "Running tests..."; ./${TARGET} run_tests.commands = echo "Running tests..."; ./${TARGET}
@@ -30,6 +43,7 @@ clean_tests.depends = clean
QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
INCLUDEPATH += $$ANTLR_INCLUDEPATH INCLUDEPATH += $$ANTLR_INCLUDEPATH
DEPENDPATH += $$ANTLR_INCLUDEPATH
DEFINES += $$ANTLR_DEFINES DEFINES += $$ANTLR_DEFINES
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below # fwtransfer lib. Add this before adding -lQtDBus to LIBS below