summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
-rw-r--r--noncore/settings/mediummount/opie-mediummount.control2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fc1de33..fec45eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,75 +1,76 @@
1default: dynamic 1default: dynamic
2 2
3all: default docs 3all: default docs
4 4
5LIBS=library libopie 5LIBS=library libopie
6 6
7COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ 7COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
8 inputmethods/pickboard \ 8 inputmethods/pickboard \
9 inputmethods/handwriting \ 9 inputmethods/handwriting \
10 inputmethods/unikeyboard \ 10 inputmethods/unikeyboard \
11 inputmethods/jumpx \ 11 inputmethods/jumpx \
12 inputmethods/dvorak \ 12 inputmethods/dvorak \
13 launcher/batteryapplet \ 13 launcher/batteryapplet \
14 launcher/irdaapplet \ 14 launcher/irdaapplet \
15 launcher/volumeapplet \ 15 launcher/volumeapplet \
16 launcher/clockapplet \ 16 launcher/clockapplet \
17 launcher/netmonapplet \ 17 launcher/netmonapplet \
18 launcher/screenshotapplet \ 18 launcher/screenshotapplet \
19 launcher/vmemo \ 19 launcher/vmemo \
20 netsetup/dialup \ 20 netsetup/dialup \
21 netsetup/lan \ 21 netsetup/lan \
22 opiemail/ifaces/pop3 opiemail/ifaces/smtp \ 22 opiemail/ifaces/pop3 opiemail/ifaces/smtp \
23 core/opieplayer/libmpeg3 \ 23 core/opieplayer/libmpeg3 \
24 core/opieplayer/libmad \ 24 core/opieplayer/libmad \
25 core/opieplayer/wavplugin \ 25 core/opieplayer/wavplugin \
26 cardmon \ 26 cardmon \
27 sdmon 27 sdmon
28 28
29APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \ 29APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
30 filebrowser helpbrowser minesweep core/opieplayer \ 30 filebrowser helpbrowser minesweep core/opieplayer \
31 settings/light-and-power \ 31 settings/light-and-power \
32 settings/language \ 32 settings/language \
33 settings/rotation \ 33 settings/rotation \
34 settings/appearance \ 34 settings/appearance \
35 settings/security \ 35 settings/security \
36 settings/sound \ 36 settings/sound \
37 settings/systemtime \ 37 settings/systemtime \
38 settings/mediummount \
38 solitaire spreadsheet tetrix textedit \ 39 solitaire spreadsheet tetrix textedit \
39 todo wordgame embeddedkonsole launcher sysinfo \ 40 todo wordgame embeddedkonsole launcher sysinfo \
40 parashoot snake citytime showimg netsetup core/wlansetup tableviewer \ 41 parashoot snake citytime showimg netsetup core/wlansetup tableviewer \
41 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ 42 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
42 noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \ 43 noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \
43 noncore/kpacman noncore/advancedfm noncore/kbill 44 noncore/kpacman noncore/advancedfm noncore/kbill
44 45
45NONTMAKEAPPS := noncore/nethack 46NONTMAKEAPPS := noncore/nethack
46 47
47DOCS = docs/src/opie-policy 48DOCS = docs/src/opie-policy
48single: mpegplayer/libmpeg3 49single: mpegplayer/libmpeg3
49 50
50dynamic: $(APPS) $(NONTMAKEAPPS) 51dynamic: $(APPS) $(NONTMAKEAPPS)
51 52
52docs: $(DOCS) 53docs: $(DOCS)
53 54
54$(COMPONENTS): $(LIBS) 55$(COMPONENTS): $(LIBS)
55 56
56$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) 57$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
57 58
58$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single: 59$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
59 $(MAKE) -C $@ -f Makefile 60 $(MAKE) -C $@ -f Makefile
60 61
61showcomponents: 62showcomponents:
62 @echo $(LIBS) $(APPS) $(COMPONENTS) single 63 @echo $(LIBS) $(APPS) $(COMPONENTS) single
63 64
64clean: 65clean:
65 $(MAKE) -C single -f Makefile $@ 66 $(MAKE) -C single -f Makefile $@
66 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 67 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
67 68
68lupdate: 69lupdate:
69 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 70 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
70 71
71lrelease: 72lrelease:
72 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 73 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
73 74
74 75
75.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean 76.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index c818913..bf8d9d7 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -1,10 +1,10 @@
1Files: bin/mediummount apps/Settings/mediummount.desktop pics/mediummount/* 1Files: bin/mediummount apps/Settings/medium.desktop
2Priority: optional 2Priority: optional
3Section: opie/settings 3Section: opie/settings
4Maintainer: Holger Freyther <zecke@handhelds.org> 4Maintainer: Holger Freyther <zecke@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.1 6Version: $QPE_VERSION-$SUB_VERSION.1
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
8License: GPL 8License: GPL
9Description: Configure app for the medium mounter 9Description: Configure app for the medium mounter
10 Configure app for the medium mounter 10 Configure app for the medium mounter