-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 8 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.pro | 9 |
2 files changed, 15 insertions, 2 deletions
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,9 +1,9 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | CONFIG = qt warn_on | 3 | CONFIG = qt warn_on |
4 | 4 | ||
5 | HEADERS = wellenreiterbase.h \ | 5 | HEADERS = wellenreiterbase.h \ |
6 | mainwindow.h \ | 6 | mainwindow.h \ |
7 | wellenreiter.h \ | 7 | wellenreiter.h \ |
8 | scanlist.h \ | 8 | scanlist.h \ |
9 | logwindow.h \ | 9 | logwindow.h \ |
@@ -44,6 +44,12 @@ contains( platform, x11 ) { | |||
44 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter | 44 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
45 | SOURCES += resource.cpp | 45 | SOURCES += resource.cpp |
46 | HEADERS += resource.h | 46 | HEADERS += resource.h |
47 | DESTDIR = $(OPIEDIR)/output/bin | 47 | DESTDIR = $(OPIEDIR)/output/bin |
48 | } | 48 | } |
49 | 49 | ||
50 | !isEmpty( LIBPCAP_INC_DIR ) { | ||
51 | INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH | ||
52 | } | ||
53 | !isEmpty( LIBPCAP_LIB_DIR ) { | ||
54 | LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS | ||
55 | } | ||
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,8 +1,8 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
3 | DESTDIR = $(OPIEDIR)/plugins/networksettings | 3 | DESTDIR = $(OPIEDIR)/plugins/networksettings |
4 | HEADERS = infoimp.h wlanmodule.h wextensions.h keyedit.h | 4 | HEADERS = infoimp.h wlanmodule.h wextensions.h keyedit.h |
5 | SOURCES = infoimp.cpp wlanmodule.cpp wextensions.cpp keyedit.cpp | 5 | SOURCES = infoimp.cpp wlanmodule.cpp wextensions.cpp keyedit.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ | 6 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ |
7 | DEPENDPATH+= $(OPIEDIR)/include | 7 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe -L../interfaces/ -linterfaces -lopiecore2 -lopienet2 | 8 | LIBS += -lqpe -L../interfaces/ -linterfaces -lopiecore2 -lopienet2 |
@@ -20,6 +20,13 @@ wirelessopts { | |||
20 | ! wirelessopts { | 20 | ! wirelessopts { |
21 | HEADERS+= wlanimp2.h | 21 | HEADERS+= wlanimp2.h |
22 | SOURCES += wlanimp2.cpp | 22 | SOURCES += wlanimp2.cpp |
23 | } | 23 | } |
24 | 24 | ||
25 | include ( $(OPIEDIR)/include.pro ) | 25 | include ( $(OPIEDIR)/include.pro ) |
26 | |||
27 | !isEmpty( LIBPCAP_INC_DIR ) { | ||
28 | INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH | ||
29 | } | ||
30 | !isEmpty( LIBPCAP_LIB_DIR ) { | ||
31 | LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS | ||
32 | } | ||