author | mickeyl <mickeyl> | 2004-01-21 23:41:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-01-21 23:41:53 (UTC) |
commit | a428ff7937dae04b1b51d3e91f46c74f4f869543 (patch) (unidiff) | |
tree | 35e266a250a893ad3eb7b934296538ea82722954 /libopie2/opiecore | |
parent | cc5d48b188c21ff873300179264ab354d4c8aa09 (diff) | |
download | opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.zip opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.gz opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.bz2 |
catch up with moves on cvs server
-rw-r--r-- | libopie2/opiecore/device/.cvsignore | 6 | ||||
-rw-r--r-- | libopie2/opiecore/device/device.pro | 19 | ||||
-rw-r--r-- | libopie2/opiecore/libopiecore2.control | 2 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 23 |
4 files changed, 29 insertions, 21 deletions
diff --git a/libopie2/opiecore/device/.cvsignore b/libopie2/opiecore/device/.cvsignore new file mode 100644 index 0000000..8f7300c --- a/dev/null +++ b/libopie2/opiecore/device/.cvsignore | |||
@@ -0,0 +1,6 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | *moc | ||
4 | *.o | ||
5 | ~* | ||
6 | |||
diff --git a/libopie2/opiecore/device/device.pro b/libopie2/opiecore/device/device.pro new file mode 100644 index 0000000..946bff1 --- a/dev/null +++ b/libopie2/opiecore/device/device.pro | |||
@@ -0,0 +1,19 @@ | |||
1 | HEADERS += device/odevice.h \ | ||
2 | device/odevicebutton.h \ | ||
3 | device/odevice_ipaq.h \ | ||
4 | device/odevice_jornada.h \ | ||
5 | device/odevice_ramses.h \ | ||
6 | device/odevice_simpad.h \ | ||
7 | device/odevice_zaurus.h \ | ||
8 | device/odevice_yopy.h \ | ||
9 | |||
10 | SOURCES += device/odevice.cpp \ | ||
11 | device/odevicebutton.cpp \ | ||
12 | device/odevice_ipaq.cpp \ | ||
13 | device/odevice_jornada.cpp\ | ||
14 | device/odevice_ramses.cpp \ | ||
15 | device/odevice_simpad.cpp \ | ||
16 | device/odevice_zaurus.cpp \ | ||
17 | device/odevice_yopy.cpp \ | ||
18 | |||
19 | |||
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index f0a3afc..4679f28 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiecore2 | 1 | Package: libopiecore2 |
2 | Files: $OPIEDIR/lib/libopiecore2.so.* | 2 | Files: $OPIEDIR/lib/libopiecore2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
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.2 | 7 | Version: 1.8.5-$SUB_VERSION.1 |
8 | Depends: libqpe1 | 8 | Depends: libqpe1 |
9 | Provides: libopiecore2 | 9 | Provides: libopiecore2 |
10 | Description: Opie library 2.0 CORE | 10 | Description: Opie library 2.0 CORE |
11 | 11 | ||
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index 98d315f..7a75a02 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro | |||
@@ -1,55 +1,38 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = oapplication.h \ | 4 | HEADERS = oapplication.h \ |
5 | oconfig.h \ | 5 | oconfig.h \ |
6 | odebug.h \ | 6 | odebug.h \ |
7 | odevice.h \ | ||
8 | odevicebutton.h \ | ||
9 | odevice_ipaq.h \ | ||
10 | odevice_jornada.h \ | ||
11 | odevice_ramses.h \ | ||
12 | odevice_simpad.h \ | ||
13 | odevice_zaurus.h \ | ||
14 | odevice_yopy.h \ | ||
15 | oglobal.h \ | 7 | oglobal.h \ |
16 | oglobalsettings.h \ | 8 | oglobalsettings.h \ |
17 | oprocess.h \ | 9 | oprocess.h \ |
18 | oprocctrl.h \ | 10 | oprocctrl.h \ |
19 | ostorageinfo.h | 11 | ostorageinfo.h |
20 | 12 | ||
21 | SOURCES = oapplication.cpp \ | 13 | SOURCES = oapplication.cpp \ |
22 | oconfig.cpp \ | 14 | oconfig.cpp \ |
23 | odebug.cpp \ | 15 | odebug.cpp \ |
24 | odevice.cpp \ | ||
25 | odevicebutton.cpp \ | ||
26 | odevice_ipaq.cpp \ | ||
27 | odevice_jornada.cpp \ | ||
28 | odevice_ramses.cpp \ | ||
29 | odevice_simpad.cpp \ | ||
30 | odevice_zaurus.cpp \ | ||
31 | odevice_yopy.cpp \ | ||
32 | oglobal.cpp \ | 16 | oglobal.cpp \ |
33 | oglobalsettings.cpp \ | 17 | oglobalsettings.cpp \ |
34 | oprocess.cpp \ | 18 | oprocess.cpp \ |
35 | oprocctrl.cpp \ | 19 | oprocctrl.cpp \ |
36 | ostorageinfo.cpp | 20 | ostorageinfo.cpp |
37 | 21 | ||
22 | include ( device/device.pro ) | ||
23 | |||
38 | INTERFACES = | 24 | INTERFACES = |
39 | TARGET = opiecore2 | 25 | TARGET = opiecore2 |
40 | VERSION = 1.8.3 | 26 | VERSION = 1.8.5 |
41 | INCLUDEPATH += $(OPIEDIR)/include | 27 | INCLUDEPATH += $(OPIEDIR)/include |
42 | DEPENDPATH += $(OPIEDIR)/include | 28 | DEPENDPATH += $(OPIEDIR)/include |
43 | MOC_DIR = moc | ||
44 | OBJECTS_DIR = obj | ||
45 | |||
46 | 29 | ||
47 | !contains( platform, x11 ) { | 30 | !contains( platform, x11 ) { |
48 | LIBS = -lqpe | 31 | LIBS = -lqpe |
49 | include ( $(OPIEDIR)/include.pro ) | 32 | include ( $(OPIEDIR)/include.pro ) |
50 | } | 33 | } |
51 | 34 | ||
52 | contains( platform, x11 ) { | 35 | contains( platform, x11 ) { |
53 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 36 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
54 | } | 37 | } |
55 | 38 | ||