| author | ar <ar> | 2004-08-20 17:46:51 (UTC) |
|---|---|---|
| committer | ar <ar> | 2004-08-20 17:46:51 (UTC) |
| commit | d24c046127088eb8c2af9612043aba70fae66af6 (patch) (side-by-side diff) | |
| tree | b36e077f1b5f2410e49162f1d96b231253ea1a20 | |
| parent | 59839a95f350cb0b48ca77e0390aee2c1a9b312b (diff) | |
| download | opie-d24c046127088eb8c2af9612043aba70fae66af6.zip opie-d24c046127088eb8c2af9612043aba70fae66af6.tar.gz opie-d24c046127088eb8c2af9612043aba70fae66af6.tar.bz2 | |
- add libpcap dir to lib- and include directory
| -rw-r--r-- | libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro | 8 | ||||
| -rw-r--r-- | libopie2/opienet/opienet.pro | 10 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 8 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlan.pro | 9 |
4 files changed, 30 insertions, 5 deletions
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro index 5fccd30..fbbff27 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro @@ -1,13 +1,19 @@ TEMPLATE = app -CONFIG = qt warn_on +CONFIG = qt warn_on HEADERS = SOURCES = miniwellenreiter.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 -lopienet2 TARGET = miniwellenreiter MOC_DIR = moc OBJECTS_DIR = obj include ( $(OPIEDIR)/include.pro ) +!isEmpty( LIBPCAP_INC_DIR ) { + INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH +} +!isEmpty( LIBPCAP_LIB_DIR ) { + LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS +} diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro index 4aef6c2..da062e4 100644 --- a/libopie2/opienet/opienet.pro +++ b/libopie2/opienet/opienet.pro @@ -1,10 +1,10 @@ TEMPLATE = lib -CONFIG += qt warn_on +CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib HEADERS = 802_11_user.h \ dhcp.h \ udp_ports.h \ odebugmapper.h \ omanufacturerdb.h \ onetutils.h \ onetwork.h \ @@ -24,11 +24,17 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lpcap !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { - LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } +!isEmpty( LIBPCAP_INC_DIR ) { + INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH +} +!isEmpty( LIBPCAP_LIB_DIR ) { + LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS +} diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 93d42ed..f773cf3 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -1,11 +1,11 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app -CONFIG = qt warn_on +CONFIG = qt warn_on HEADERS = wellenreiterbase.h \ mainwindow.h \ wellenreiter.h \ scanlist.h \ logwindow.h \ hexwindow.h \ statwindow.h \ @@ -42,8 +42,14 @@ TARGET = wellenreiter contains( platform, x11 ) { LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter SOURCES += resource.cpp HEADERS += resource.h DESTDIR = $(OPIEDIR)/output/bin } +!isEmpty( LIBPCAP_INC_DIR ) { + INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH +} +!isEmpty( LIBPCAP_LIB_DIR ) { + LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS +} diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro index c94dc0e..c04d2c0 100644 --- a/noncore/settings/networksettings/wlan/wlan.pro +++ b/noncore/settings/networksettings/wlan/wlan.pro @@ -1,10 +1,10 @@ TEMPLATE = lib -CONFIG += qt plugin warn_on +CONFIG += qt plugin warn_on DESTDIR = $(OPIEDIR)/plugins/networksettings HEADERS = infoimp.h wlanmodule.h wextensions.h keyedit.h SOURCES = infoimp.cpp wlanmodule.cpp wextensions.cpp keyedit.cpp INCLUDEPATH += $(OPIEDIR)/include ../ ../interfaces/ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -L../interfaces/ -linterfaces -lopiecore2 -lopienet2 INTERFACES = wlan.ui info.ui TARGET = wlan @@ -18,8 +18,15 @@ wirelessopts { } ! wirelessopts { HEADERS += wlanimp2.h SOURCES += wlanimp2.cpp } include ( $(OPIEDIR)/include.pro ) + +!isEmpty( LIBPCAP_INC_DIR ) { + INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH +} +!isEmpty( LIBPCAP_LIB_DIR ) { + LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS +} |