author | mickeyl <mickeyl> | 2004-05-03 20:45:10 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-03 20:45:10 (UTC) |
commit | d1095d71394779557f446e2a67ba55bc62eec859 (patch) (unidiff) | |
tree | 27ea7c84f26d1722a82d3659f605da725e3762fc | |
parent | cc828fdbddcc8572fd54d01f50c26e77ccd4c7b2 (diff) | |
download | opie-d1095d71394779557f446e2a67ba55bc62eec859.zip opie-d1095d71394779557f446e2a67ba55bc62eec859.tar.gz opie-d1095d71394779557f446e2a67ba55bc62eec859.tar.bz2 |
catch up with source changes
-rw-r--r-- | libopie2/opienet/libopienet2.control | 6 | ||||
-rw-r--r-- | libopie2/opienet/opienet.pro | 4 |
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 @@ | |||
1 | Package: libopienet2 | 1 | Package: libopienet2 |
2 | Files: lib/libopienet2.so.* etc/manufacturers | 2 | Files: lib/libopienet2.so.* etc/manufacturers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/libs |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.8.3-$SUB_VERSION | 7 | Version: 1.8.4-$SUB_VERSION |
8 | Depends: libopiecore2 (1.8.3) | 8 | Depends: libopiecore2 |
9 | Provides: libopienet2 | 9 | Provides: libopienet2 |
10 | Description: Opie library 2.0 NET | 10 | Description: 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 @@ | |||
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 | 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 |
15 | SOURCES = odebugmapper.cpp \ | 13 | SOURCES = 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 |
21 | INTERFACES = | 19 | INTERFACES = |
22 | TARGET = opienet2 | 20 | TARGET = opienet2 |
23 | VERSION = 1.8.3 | 21 | VERSION = 1.8.4 |
24 | INCLUDEPATH += $(OPIEDIR)/include | 22 | INCLUDEPATH += $(OPIEDIR)/include |
25 | DEPENDPATH += $(OPIEDIR)/include | 23 | DEPENDPATH += $(OPIEDIR)/include |
26 | LIBS += -lpcap | 24 | LIBS += -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 | ||
33 | contains( platform, x11 ) { | 31 | contains( platform, x11 ) { |
34 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 32 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
35 | } | 33 | } |
36 | 34 | ||