rearranging things.

author: kergoth <kergoth> 2002-03-19 01:11:06 (UTC)
committer: kergoth <kergoth> 2002-03-19 01:11:06 (UTC)
commit: 87499b2940f77cc5469df366a3dc4ffd1fee04d3 (patch) (unidiff)
tree: d0f14e6f773a3fbf55e06ab63bc8bcd96e5d4aa9
parent: d9bbf6f090bd5e35bf2ec7782cf77de049634149 (diff)
download: opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.zip
opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.tar.gz
opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.tar.bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 677369e..24a9050 100644
--- a/Makefile
+++ b/Makefile
@@ -1,71 +1,71 @@
 default:  dynamic
 all: default docs
 LIBS=library libopie
 COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
        inputmethods/pickboard \
        inputmethods/handwriting \
        inputmethods/unikeyboard \
        inputmethods/jumpx \
        inputmethods/dvorak \
        taskbar/batteryapplet \
        taskbar/volumeapplet \
        taskbar/clockapplet \
        taskbar/netmonapplet \
        taskbar/screenshotapplet \
        taskbar/vmemo \
        netsetup/dialup \
        netsetup/lan \
        opiemail/ifaces/pop3 opiemail/ifaces/smtp \
        mpegplayer/libmpeg3 \
        mpegplayer/libmad \
        mpegplayer/wavplugin \
        cardmon \
        sdmon 
-APPS=$(LOCALAPPS) addressbook calculator clock datebook \
+APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
    filebrowser helpbrowser minesweep mpegplayer \
    settings/light-and-power \
    settings/language \
    settings/rotation \
    settings/appearance \
    settings/security \
    settings/sound \
    settings/systemtime \
    solitaire spreadsheet tetrix textedit \
    todo wordgame embeddedkonsole taskbar sysinfo \
    parashoot snake citytime showimg netsetup tableviewer \
    qipkg mindbreaker go qasteroids qcop fifteen keypebble  today opiemail/converter opiemail \
    noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 dynamic: $(APPS)
 docs: $(DOCS)
 $(COMPONENTS): $(LIBS)
 $(APPS): $(LIBS) $(COMPONENTS)
 $(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single:
        $(MAKE) -C $@ -f Makefile
 showcomponents:
        @echo $(LIBS) $(APPS) $(COMPONENTS) single
 clean:
        $(MAKE) -C single -f Makefile $@
        for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 lupdate:
        for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 lrelease:
        for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 .PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
author	kergoth <kergoth>	2002-03-19 01:11:06 (UTC)
committer	kergoth <kergoth>	2002-03-19 01:11:06 (UTC)
commit	87499b2940f77cc5469df366a3dc4ffd1fee04d3 (patch) (unidiff)
tree	d0f14e6f773a3fbf55e06ab63bc8bcd96e5d4aa9
parent	d9bbf6f090bd5e35bf2ec7782cf77de049634149 (diff)
download	opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.zip opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.tar.gz opie-87499b2940f77cc5469df366a3dc4ffd1fee04d3.tar.bz2

diff --git a/Makefile b/Makefile index 677369e..24a9050 100644 --- a/Makefile +++ b/Makefile
@@ -1,71 +1,71 @@
1	default: dynamic	1	default: dynamic
2		2
3	all: default docs	3	all: default docs
4		4
5	LIBS=library libopie	5	LIBS=library libopie
6		6
7	COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \	7	COMPONENTS=$(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	taskbar/batteryapplet \	13	taskbar/batteryapplet \
14	taskbar/volumeapplet \	14	taskbar/volumeapplet \
15	taskbar/clockapplet \	15	taskbar/clockapplet \
16	taskbar/netmonapplet \	16	taskbar/netmonapplet \
17	taskbar/screenshotapplet \	17	taskbar/screenshotapplet \
18	taskbar/vmemo \	18	taskbar/vmemo \
19	netsetup/dialup \	19	netsetup/dialup \
20	netsetup/lan \	20	netsetup/lan \
21	opiemail/ifaces/pop3 opiemail/ifaces/smtp \	21	opiemail/ifaces/pop3 opiemail/ifaces/smtp \
22	mpegplayer/libmpeg3 \	22	mpegplayer/libmpeg3 \
23	mpegplayer/libmad \	23	mpegplayer/libmad \
24	mpegplayer/wavplugin \	24	mpegplayer/wavplugin \
25	cardmon \	25	cardmon \
26	sdmon	26	sdmon
27		27
28	APPS=$(LOCALAPPS) addressbook calculator clock datebook \	28	APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
29	filebrowser helpbrowser minesweep mpegplayer \	29	filebrowser helpbrowser minesweep mpegplayer \
30	settings/light-and-power \	30	settings/light-and-power \
31	settings/language \	31	settings/language \
32	settings/rotation \	32	settings/rotation \
33	settings/appearance \	33	settings/appearance \
34	settings/security \	34	settings/security \
35	settings/sound \	35	settings/sound \
36	settings/systemtime \	36	settings/systemtime \
37	solitaire spreadsheet tetrix textedit \	37	solitaire spreadsheet tetrix textedit \
38	todo wordgame embeddedkonsole taskbar sysinfo \	38	todo wordgame embeddedkonsole taskbar sysinfo \
39	parashoot snake citytime showimg netsetup tableviewer \	39	parashoot snake citytime showimg netsetup tableviewer \
40	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \	40	qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
41	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers	41	noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
42		42
43	DOCS = docs/src/opie-policy	43	DOCS = docs/src/opie-policy
44	single: mpegplayer/libmpeg3	44	single: mpegplayer/libmpeg3
45		45
46	dynamic: $(APPS)	46	dynamic: $(APPS)
47		47
48	docs: $(DOCS)	48	docs: $(DOCS)
49		49
50	$(COMPONENTS): $(LIBS)	50	$(COMPONENTS): $(LIBS)
51		51
52	$(APPS): $(LIBS) $(COMPONENTS)	52	$(APPS): $(LIBS) $(COMPONENTS)
53		53
54	$(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single:	54	$(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single:
55	$(MAKE) -C $@ -f Makefile	55	$(MAKE) -C $@ -f Makefile
56		56
57	showcomponents:	57	showcomponents:
58	@echo $(LIBS) $(APPS) $(COMPONENTS) single	58	@echo $(LIBS) $(APPS) $(COMPONENTS) single
59		59
60	clean:	60	clean:
61	$(MAKE) -C single -f Makefile $@	61	$(MAKE) -C single -f Makefile $@
62	for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done	62	for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
63		63
64	lupdate:	64	lupdate:
65	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done	65	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
66		66
67	lrelease:	67	lrelease:
68	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done	68	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
69		69
70		70
71	.PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean	71	.PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean