summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make12
-rw-r--r--config.in5
-rw-r--r--packages6
3 files changed, 21 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index 16c6455..a707751 100644
--- a/Rules.make
+++ b/Rules.make
@@ -26,56 +26,64 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
26 @cat $(TOPDIR)/packages | \ 26 @cat $(TOPDIR)/packages | \
27 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 27 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
28 28
29$(TOPDIR)/.depends.cfgs: 29$(TOPDIR)/.depends.cfgs:
30# config.in interdependencies 30# config.in interdependencies
31 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 31 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
32 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 32 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
33 @-rm -f dirs 33 @-rm -f dirs
34 34
35$(QTDIR)/stamp-headers : 35$(QTDIR)/stamp-headers :
36 @-rm -f $(QTDIR)/stamp-headers* 36 @-rm -f $(QTDIR)/stamp-headers*
37 ( cd $(QTDIR)/include; \ 37 ( cd $(QTDIR)/include; \
38 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 38 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
39 qcopchannel_qws.h qwindowsystem_qws.h \ 39 qcopchannel_qws.h qwindowsystem_qws.h \
40 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 40 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
41 touch $@ 41 touch $@
42 42
43$(QTDIR)/stamp-headers-x11 : 43$(QTDIR)/stamp-headers-x11 :
44 @-rm -f $(QTDIR)/stamp-headers* 44 @-rm -f $(QTDIR)/stamp-headers*
45 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 45 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
46 touch $@ 46 touch $@
47 47
48$(OPIEDIR)/stamp-headers : 48$(OPIEDIR)/stamp-headers :
49 @-rm -f $(OPIEDIR)/stamp-headers* 49 @-rm -f $(OPIEDIR)/stamp-headers*
50 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 50 mkdir -p $(TOPDIR)/include/qpe \
51 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 51 $(TOPDIR)/include/qtopia \
52 $(TOPDIR)/include/opie \
53 $(TOPDIR)/include/qtopia/private \
54 $(TOPDIR)/include/opie2
52 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 55 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
53 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 56 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
54 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 57 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
55 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 58 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
56 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 59 ( cd include/opie && ln -sf ../../libsql/*.h .; )
57 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 60 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
61 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
62 #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
63 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
64 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
65 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
58 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 66 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
59 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 67 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
60 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 68 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
61 touch $@ 69 touch $@
62 70
63$(OPIEDIR)/stamp-headers-x11 : 71$(OPIEDIR)/stamp-headers-x11 :
64 @-rm -f $(OPIEDIR)/stamp-headers* 72 @-rm -f $(OPIEDIR)/stamp-headers*
65 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 73 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
66 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 74 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
67 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 75 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
68 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 76 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
69 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 77 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
70 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 78 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
71 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 79 ( cd include/opie && ln -sf ../../libsql/*.h .; )
72 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 80 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
73 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 81 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
74 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 82 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
75 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 83 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
76 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 84 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
77 touch $@ 85 touch $@
78 86
79$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 87$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
80 @-rm -f $@ 88 @-rm -f $@
81 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 89 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
diff --git a/config.in b/config.in
index 97e1e80..7736ef2 100644
--- a/config.in
+++ b/config.in
@@ -127,24 +127,29 @@ menu "Graphics and Multimedia"
127 source noncore/multimedia/config.in 127 source noncore/multimedia/config.in
128endmenu 128endmenu
129menu "Input methods" 129menu "Input methods"
130 source inputmethods/config.in 130 source inputmethods/config.in
131endmenu 131endmenu
132menu "Pim" 132menu "Pim"
133 source core/pim/config.in 133 source core/pim/config.in
134 menu "Today Plugins" 134 menu "Today Plugins"
135 source noncore/todayplugins/config.in 135 source noncore/todayplugins/config.in
136 source core/pim/today/plugins/config.in 136 source core/pim/today/plugins/config.in
137 endmenu 137 endmenu
138endmenu 138endmenu
139menu "Settings" 139menu "Settings"
140 source core/settings/config.in 140 source core/settings/config.in
141 source noncore/settings/config.in 141 source noncore/settings/config.in
142endmenu 142endmenu
143menu "Theming" 143menu "Theming"
144 source noncore/decorations/config.in 144 source noncore/decorations/config.in
145 source noncore/styles/config.in 145 source noncore/styles/config.in
146endmenu 146endmenu
147menu "Tools" 147menu "Tools"
148 source noncore/tools/config.in 148 source noncore/tools/config.in
149 source development/config.in 149 source development/config.in
150endmenu 150endmenu
151comment ""
152menu "Experimental"
153 source libopie2/config.in
154endmenu
155
diff --git a/packages b/packages
index ddaba2d..1b89651 100644
--- a/packages
+++ b/packages
@@ -56,48 +56,54 @@ CONFIG_FREETYPE freetype freetype.pro
56 CONFIG_FRESH noncore/styles/freshfresh.pro 56 CONFIG_FRESH noncore/styles/freshfresh.pro
57 CONFIG_FTPLIB noncore/net/ftplibftplib.pro 57 CONFIG_FTPLIB noncore/net/ftplibftplib.pro
58 CONFIG_GO noncore/games/gogo.pro 58 CONFIG_GO noncore/games/gogo.pro
59 CONFIG_HANDWRITING inputmethods/handwritinghandwriting.pro 59 CONFIG_HANDWRITING inputmethods/handwritinghandwriting.pro
60 CONFIG_HELPBROWSER core/apps/helpbrowserhelpbrowser.pro 60 CONFIG_HELPBROWSER core/apps/helpbrowserhelpbrowser.pro
61 CONFIG_HOMEAPPLET core/applets/homeapplethomeapplet.pro 61 CONFIG_HOMEAPPLET core/applets/homeapplethomeapplet.pro
62 CONFIG_INTERFACES noncore/net/networksettings/interfacesinterfaces.pro 62 CONFIG_INTERFACES noncore/net/networksettings/interfacesinterfaces.pro
63 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro 63 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro
64 CONFIG_JUMPX inputmethods/jumpxjumpx.pro 64 CONFIG_JUMPX inputmethods/jumpxjumpx.pro
65 CONFIG_KBILL noncore/games/kbillkbill.pro 65 CONFIG_KBILL noncore/games/kbillkbill.pro
66 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro 66 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro
67 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro 67 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro
68 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro 68 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro
69 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro 69 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro
70 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro 70 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro
71 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro 71 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro
72 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro 72 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro
73 CONFIG_LAUNCHER_CORE core/launcherlauncher.pro 73 CONFIG_LAUNCHER_CORE core/launcherlauncher.pro
74 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro 74 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro
75CONFIG_LIBKATE noncore/apps/tinykate/libkate libkate.pro 75CONFIG_LIBKATE noncore/apps/tinykate/libkate libkate.pro
76 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro 76 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro
77 CONFIG_LIBMAIL noncore/mail/libmaillibmail.pro 77 CONFIG_LIBMAIL noncore/mail/libmaillibmail.pro
78 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro 78 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro
79 CONFIG_LIBOPIE libopielibopie.pro 79 CONFIG_LIBOPIE libopielibopie.pro
80 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro
81 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro
82 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro
83 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro
84 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro
85 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro
80 CONFIG_LIBQPE librarylibrary.pro 86 CONFIG_LIBQPE librarylibrary.pro
81 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 87 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
82 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro 88 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro
83 CONFIG_LIQUID noncore/styles/liquidliquid.pro 89 CONFIG_LIQUID noncore/styles/liquidliquid.pro
84 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro 90 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro
85 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro 91 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro
86 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro 92 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro
87 CONFIG_METAL noncore/styles/metalmetal.pro 93 CONFIG_METAL noncore/styles/metalmetal.pro
88 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro 94 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro
89 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro 95 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro
90 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro 96 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro
91 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro 97 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro
92 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro 98 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro
93 CONFIG_NETWORKSETUP noncore/net/networksettingsnetworksettings.pro 99 CONFIG_NETWORKSETUP noncore/net/networksettingsnetworksettings.pro
94 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro 100 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro
95 CONFIG_OBEX core/applets/obex2obex.pro 101 CONFIG_OBEX core/applets/obex2obex.pro
96 CONFIG_OCOPSERVER x11/ipc/serverocopserver.pro 102 CONFIG_OCOPSERVER x11/ipc/serverocopserver.pro
97 CONFIG_OIPKG core/apps/oipkgoipkg.pro 103 CONFIG_OIPKG core/apps/oipkgoipkg.pro
98 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro 104 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro
99 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro 105 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro
100 CONFIG_OPIEMAIL2noncore/mail mail.pro 106 CONFIG_OPIEMAIL2noncore/mail mail.pro
101 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro 107 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro
102 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro 108 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro
103 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro 109 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro