summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-24 18:40:29 (UTC)
committer sandman <sandman>2002-11-24 18:40:29 (UTC)
commit30151dca910f07170cd4773b9e440c37d53d500e (patch) (unidiff)
treea1f22bd60bf6aa5107fd02157f718a1cf381b01a
parent75cf5d2277d66f533167bcb2e3b6f0eee2424d96 (diff)
downloadopie-30151dca910f07170cd4773b9e440c37d53d500e.zip
opie-30151dca910f07170cd4773b9e440c37d53d500e.tar.gz
opie-30151dca910f07170cd4773b9e440c37d53d500e.tar.bz2
- added the new preload lib to the main Makefile
- added the new preload lib to the launcher ipk control file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
-rw-r--r--core/launcher/opie-taskbar.control2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4278d1f..5b4c86b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,48 +25,49 @@ APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
25MAIL= noncore/mail/libmail noncore/mail/bend 25MAIL= noncore/mail/libmail noncore/mail/bend
26 26
27PLAYER = core/multimedia/opieplayer/libmpeg3 \ 27PLAYER = core/multimedia/opieplayer/libmpeg3 \
28 core/multimedia/opieplayer/libmad \ 28 core/multimedia/opieplayer/libmad \
29 core/multimedia/opieplayer/wavplugin \ 29 core/multimedia/opieplayer/wavplugin \
30 core/multimedia/opieplayer/modplug 30 core/multimedia/opieplayer/modplug
31 31
32 COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) 32 COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
33 33
34 34
35PIMAPPS = core/pim/addressbook core/pim/datebook \ 35PIMAPPS = core/pim/addressbook core/pim/datebook \
36 core/pim/today core/pim/todo 36 core/pim/today core/pim/todo
37 37
38TODAYPLUGINS = core/pim/today/plugins/datebook \ 38TODAYPLUGINS = core/pim/today/plugins/datebook \
39 core/pim/today/plugins/todolist \ 39 core/pim/today/plugins/todolist \
40 core/pim/today/plugins/mail \ 40 core/pim/today/plugins/mail \
41 noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \ 41 noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
42 noncore/todayplugins/fortune \ 42 noncore/todayplugins/fortune \
43 noncore/todayplugins/weather 43 noncore/todayplugins/weather
44 44
45 45
46COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ 46COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
47 core/apps/textedit core/apps/embeddedkonsole \ 47 core/apps/textedit core/apps/embeddedkonsole \
48 core/launcher \ 48 core/launcher \
49 core/launcher/libpreload \
49 core/opie-login \ 50 core/opie-login \
50 core/apps/oipkg core/apps/qcop 51 core/apps/oipkg core/apps/qcop
51 52
52COREMULTIMEDIA = core/multimedia/opieplayer 53COREMULTIMEDIA = core/multimedia/opieplayer
53 54
54CORESETTINGS = core/settings/light-and-power core/settings/security \ 55CORESETTINGS = core/settings/light-and-power core/settings/security \
55 noncore/settings/netsystemtime core/settings/citytime \ 56 noncore/settings/netsystemtime core/settings/citytime \
56 core/settings/launcher 57 core/settings/launcher
57 58
58NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ 59NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
59 noncore/settings/appearance2 noncore/settings/sound \ 60 noncore/settings/appearance2 noncore/settings/sound \
60 noncore/settings/mediummount \ 61 noncore/settings/mediummount \
61 noncore/settings/tabmanager noncore/settings/appskey \ 62 noncore/settings/tabmanager noncore/settings/appskey \
62 noncore/settings/sshkeys noncore/settings/usermanager \ 63 noncore/settings/sshkeys noncore/settings/usermanager \
63 noncore/settings/backup 64 noncore/settings/backup
64 65
65NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \ 66NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
66 noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \ 67 noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
67 noncore/tools/formatter 68 noncore/tools/formatter
68 69
69NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \ 70NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
70 noncore/styles/flat noncore/styles/fresh 71 noncore/styles/flat noncore/styles/fresh
71 72
72NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \ 73NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 13e5715..dca4b08 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
1Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* 1Files: bin/qpe $QTDIR/lib/libpreload.so* apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so*
2Priority: required 2Priority: required
3Section: opie/system 3Section: opie/system
4Maintainer: Project Opie <opie@handhelds.org> 4Maintainer: Project Opie <opie@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.1 6Version: $QPE_VERSION-$SUB_VERSION.1
7Depends: qt-embedded (>=$QTE_VERSION) 7Depends: qt-embedded (>=$QTE_VERSION)
8Description: Launcher for Opie 8Description: Launcher for Opie
9 The "finder" or "explorer", or whatever you want to call it. 9 The "finder" or "explorer", or whatever you want to call it.