summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-12-16 20:34:55 (UTC)
committer kergoth <kergoth>2002-12-16 20:34:55 (UTC)
commit05ee76167ad314aea710966e7c93b124da252a95 (patch) (unidiff)
treeb2b9d625632bccd6be1dfa8da9506a7cfdd5e569
parentf23f43f002c18f62e8decb22476a33407b8e017f (diff)
downloadopie-05ee76167ad314aea710966e7c93b124da252a95.zip
opie-05ee76167ad314aea710966e7c93b124da252a95.tar.gz
opie-05ee76167ad314aea710966e7c93b124da252a95.tar.bz2
undo a miscommit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 339aec1..15c9b5f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,138 +1,138 @@
1hehindefault: dynamic 1hehindefault: dynamic
2 2
3all: default docs 3all: default docs
4 4
5LIBS=library libopie 5LIBS=library libopie
6 6
7 7
8INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \ 8INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
9 inputmethods/handwriting inputmethods/unikeyboard \ 9 inputmethods/handwriting inputmethods/unikeyboard \
10 inputmethods/jumpx inputmethods/kjumpx \ 10 inputmethods/jumpx inputmethods/kjumpx \
11 inputmethods/dvorak inputmethods/multikey \ 11 inputmethods/dvorak inputmethods/multikey \
12 12
13APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \ 13APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
14 core/applets/irdaapplet core/applets/volumeapplet \ 14 core/applets/irdaapplet core/applets/volumeapplet \
15 core/applets/clockapplet \ 15 core/applets/clockapplet \
16 core/applets/homeapplet core/applets/suspendapplet \ 16 core/applets/homeapplet core/applets/suspendapplet \
17 core/applets/logoutapplet core/applets/runapplet \ 17 core/applets/logoutapplet \
18 core/applets/screenshotapplet core/applets/clipboardapplet \ 18 core/applets/screenshotapplet core/applets/clipboardapplet \
19 core/applets/cardmon core/applets/obex \ 19 core/applets/cardmon core/applets/obex \
20 core/applets/vmemo \ 20 core/applets/vmemo \
21 noncore/net/networksetup/interfaces \ 21 noncore/net/networksetup/interfaces \
22 noncore/net/networksetup/wlan \ 22 noncore/net/networksetup/wlan \
23 noncore/applets/wirelessapplet noncore/applets/notesapplet 23 noncore/applets/wirelessapplet noncore/applets/notesapplet
24 24
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/opie-login \ 49 core/opie-login \
50 core/apps/oipkg core/apps/qcop 50 core/apps/oipkg core/apps/qcop
51 51
52COREMULTIMEDIA = core/multimedia/opieplayer 52COREMULTIMEDIA = core/multimedia/opieplayer
53 53
54CORESETTINGS = core/settings/light-and-power core/settings/security \ 54CORESETTINGS = core/settings/light-and-power core/settings/security \
55 noncore/settings/netsystemtime core/settings/citytime \ 55 noncore/settings/netsystemtime core/settings/citytime \
56 core/settings/launcher 56 core/settings/launcher
57 57
58NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ 58NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
59 noncore/settings/appearance2 noncore/settings/sound \ 59 noncore/settings/appearance2 noncore/settings/sound \
60 noncore/settings/mediummount \ 60 noncore/settings/mediummount \
61 noncore/settings/tabmanager noncore/settings/appskey \ 61 noncore/settings/tabmanager noncore/settings/appskey \
62 noncore/settings/sshkeys noncore/settings/usermanager \ 62 noncore/settings/sshkeys noncore/settings/usermanager \
63 noncore/settings/backup 63 noncore/settings/backup
64 64
65NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \ 65NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
66 noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \ 66 noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
67 noncore/tools/formatter 67 noncore/tools/formatter
68 68
69NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \ 69NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
70 noncore/styles/flat noncore/styles/fresh 70 noncore/styles/flat noncore/styles/fresh
71 71
72NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \ 72NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
73 noncore/decorations/polished 73 noncore/decorations/polished
74 74
75GAMES = noncore/games/minesweep noncore/games/solitaire \ 75GAMES = noncore/games/minesweep noncore/games/solitaire \
76 noncore/games/tetrix noncore/games/wordgame \ 76 noncore/games/tetrix noncore/games/wordgame \
77 noncore/games/parashoot noncore/games/snake \ 77 noncore/games/parashoot noncore/games/snake \
78 noncore/games/mindbreaker \ 78 noncore/games/mindbreaker \
79 noncore/games/go noncore/games/qasteroids \ 79 noncore/games/go noncore/games/qasteroids \
80 noncore/games/fifteen noncore/games/tictac \ 80 noncore/games/fifteen noncore/games/tictac \
81 noncore/games/kcheckers noncore/games/kpacman \ 81 noncore/games/kcheckers noncore/games/kpacman \
82 noncore/games/kbill noncore/games/buzzword \ 82 noncore/games/kbill noncore/games/buzzword \
83 noncore/games/bounce noncore/games/sfcave 83 noncore/games/bounce noncore/games/sfcave
84 84
85NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \ 85NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
86 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \ 86 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
87 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \ 87 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
88 noncore/apps/opie-console noncore/apps/opie-write 88 noncore/apps/opie-console noncore/apps/opie-write
89 89
90NONNET = noncore/net/networksetup \ 90NONNET = noncore/net/networksetup \
91 noncore/net/ftplib noncore/net/opieftp \ 91 noncore/net/ftplib noncore/net/opieftp \
92 noncore/mail 92 noncore/mail
93 93
94NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \ 94NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
95 noncore/graphics/qpdf noncore/apps/confedit 95 noncore/graphics/qpdf noncore/apps/confedit
96 96
97 97
98NONCOMM = noncore/comm/keypebble 98NONCOMM = noncore/comm/keypebble
99 99
100PLUGINS = freetype 100PLUGINS = freetype
101 101
102APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \ 102APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
103 $(COREMULTIMEDIA) $(CORESETTINGS) \ 103 $(COREMULTIMEDIA) $(CORESETTINGS) \
104 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \ 104 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
105 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \ 105 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
106 $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS) 106 $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
107 107
108 108
109 109
110NONTMAKEAPPS := core/opiealarm 110NONTMAKEAPPS := core/opiealarm
111 111
112DOCS = docs/src/opie-policy 112DOCS = docs/src/opie-policy
113 113
114dynamic: $(APPS) $(NONTMAKEAPPS) 114dynamic: $(APPS) $(NONTMAKEAPPS)
115 115
116docs: $(DOCS) 116docs: $(DOCS)
117 117
118$(COMPONENTS): $(LIBS) 118$(COMPONENTS): $(LIBS)
119 119
120$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) 120$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
121 121
122$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS): 122$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
123 $(MAKE) -C $@ -f Makefile 123 $(MAKE) -C $@ -f Makefile
124 124
125showcomponents: 125showcomponents:
126 @echo $(LIBS) $(APPS) $(COMPONENTS) 126 @echo $(LIBS) $(APPS) $(COMPONENTS)
127 127
128clean: 128clean:
129 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 129 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
130 130
131lupdate: 131lupdate:
132 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 132 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
133 133
134lrelease: 134lrelease:
135 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 135 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
136 136
137 137
138.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) showcomponents clean 138.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) showcomponents clean