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 /libopie2 | |
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 |
2 files changed, 15 insertions, 3 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 @@ | |||
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 |
7 | LIBS += -lopiecore2 -lopienet2 | 7 | LIBS += -lopiecore2 -lopienet2 |
8 | TARGET = miniwellenreiter | 8 | TARGET = miniwellenreiter |
9 | MOC_DIR = moc | 9 | 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,14 +1,14 @@ | |||
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 \ |
7 | odebugmapper.h \ | 7 | odebugmapper.h \ |
8 | omanufacturerdb.h \ | 8 | omanufacturerdb.h \ |
9 | onetutils.h \ | 9 | onetutils.h \ |
10 | onetwork.h \ | 10 | onetwork.h \ |
11 | opcap.h \ | 11 | opcap.h \ |
12 | ostation.h | 12 | ostation.h |
13 | SOURCES = odebugmapper.cpp \ | 13 | SOURCES = odebugmapper.cpp \ |
14 | omanufacturerdb.cpp \ | 14 | omanufacturerdb.cpp \ |
@@ -20,15 +20,21 @@ INTERFACES = | |||
20 | TARGET = opienet2 | 20 | TARGET = opienet2 |
21 | VERSION = 1.8.4 | 21 | VERSION = 1.8.4 |
22 | INCLUDEPATH += $(OPIEDIR)/include | 22 | INCLUDEPATH += $(OPIEDIR)/include |
23 | DEPENDPATH += $(OPIEDIR)/include | 23 | DEPENDPATH += $(OPIEDIR)/include |
24 | LIBS += -lpcap | 24 | LIBS += -lpcap |
25 | 25 | ||
26 | 26 | ||
27 | !contains( platform, x11 ) { | 27 | !contains( platform, x11 ) { |
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 | } | ||