author | ar <ar> | 2004-08-20 17:46:51 (UTC) |
---|---|---|
committer | ar <ar> | 2004-08-20 17:46:51 (UTC) |
commit | d24c046127088eb8c2af9612043aba70fae66af6 (patch) (unidiff) | |
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,6 +1,6 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | HEADERS = | 3 | HEADERS = |
4 | SOURCES = miniwellenreiter.cpp | 4 | SOURCES = miniwellenreiter.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
@@ -10,4 +10,10 @@ MOC_DIR = moc | |||
10 | OBJECTS_DIR = obj | 10 | OBJECTS_DIR = obj |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | 13 | ||
14 | !isEmpty( LIBPCAP_INC_DIR ) { | ||
15 | INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH | ||
16 | } | ||
17 | !isEmpty( LIBPCAP_LIB_DIR ) { | ||
18 | LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS | ||
19 | } | ||
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,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = 802_11_user.h \ | 4 | HEADERS = 802_11_user.h \ |
5 | dhcp.h \ | 5 | dhcp.h \ |
6 | udp_ports.h \ | 6 | udp_ports.h \ |
@@ -28,7 +28,13 @@ LIBS += -lpcap | |||
28 | include ( $(OPIEDIR)/include.pro ) | 28 | include ( $(OPIEDIR)/include.pro ) |
29 | } | 29 | } |
30 | 30 | ||
31 | contains( platform, x11 ) { | 31 | contains( platform, x11 ) { |
32 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 32 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
33 | } | 33 | } |
34 | 34 | ||
35 | !isEmpty( LIBPCAP_INC_DIR ) { | ||
36 | INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH | ||
37 | } | ||
38 | !isEmpty( LIBPCAP_LIB_DIR ) { | ||
39 | LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS | ||
40 | } | ||
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,7 +1,7 @@ | |||
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 \ |
@@ -46,4 +46,10 @@ contains( platform, x11 ) { | |||
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,6 +1,6 @@ | |||
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/ |
@@ -22,4 +22,11 @@ wirelessopts { | |||
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 | } | ||