summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-05-03 20:45:10 (UTC)
committer mickeyl <mickeyl>2004-05-03 20:45:10 (UTC)
commitd1095d71394779557f446e2a67ba55bc62eec859 (patch) (unidiff)
tree27ea7c84f26d1722a82d3659f605da725e3762fc
parentcc828fdbddcc8572fd54d01f50c26e77ccd4c7b2 (diff)
downloadopie-d1095d71394779557f446e2a67ba55bc62eec859.zip
opie-d1095d71394779557f446e2a67ba55bc62eec859.tar.gz
opie-d1095d71394779557f446e2a67ba55bc62eec859.tar.bz2
catch up with source changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/libopienet2.control6
-rw-r--r--libopie2/opienet/opienet.pro4
2 files changed, 4 insertions, 6 deletions
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control
index bfa325c..cf0128d 100644
--- a/libopie2/opienet/libopienet2.control
+++ b/libopie2/opienet/libopienet2.control
@@ -1,10 +1,10 @@
1Package: libopienet2 1Package: libopienet2
2Files: lib/libopienet2.so.* etc/manufacturers 2Files: lib/libopienet2.so.* etc/manufacturers
3Priority: optional 3Priority: optional
4Section: opie/system 4Section: opie/libs
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 1.8.3-$SUB_VERSION 7Version: 1.8.4-$SUB_VERSION
8Depends: libopiecore2 (1.8.3) 8Depends: libopiecore2
9Provides: libopienet2 9Provides: libopienet2
10Description: Opie library 2.0 NET 10Description: Opie library 2.0 NET
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 552bdb5..4aef6c2 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -1,36 +1,34 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = 802_11_user.h \ 4HEADERS = 802_11_user.h \
5 dhcp.h \ 5 dhcp.h \
6 udp_ports.h \ 6 udp_ports.h \
7 wireless.15.h \
8 wireless.16.h \
9 odebugmapper.h \ 7 odebugmapper.h \
10 omanufacturerdb.h \ 8 omanufacturerdb.h \
11 onetutils.h \ 9 onetutils.h \
12 onetwork.h \ 10 onetwork.h \
13 opcap.h \ 11 opcap.h \
14 ostation.h 12 ostation.h
15SOURCES = odebugmapper.cpp \ 13SOURCES = odebugmapper.cpp \
16 omanufacturerdb.cpp \ 14 omanufacturerdb.cpp \
17 onetutils.cpp \ 15 onetutils.cpp \
18 onetwork.cpp \ 16 onetwork.cpp \
19 opcap.cpp \ 17 opcap.cpp \
20 ostation.cpp 18 ostation.cpp
21INTERFACES = 19INTERFACES =
22TARGET = opienet2 20TARGET = opienet2
23VERSION = 1.8.3 21VERSION = 1.8.4
24INCLUDEPATH += $(OPIEDIR)/include 22INCLUDEPATH += $(OPIEDIR)/include
25DEPENDPATH += $(OPIEDIR)/include 23DEPENDPATH += $(OPIEDIR)/include
26LIBS += -lpcap 24LIBS += -lpcap
27 25
28 26
29!contains( platform, x11 ) { 27!contains( platform, x11 ) {
30 include ( $(OPIEDIR)/include.pro ) 28 include ( $(OPIEDIR)/include.pro )
31} 29}
32 30
33contains( platform, x11 ) { 31contains( platform, x11 ) {
34 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 32 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
35} 33}
36 34