Use new buildsystem, more documentation coming shortly. Also silenced dependency generation a bit.

author: kergoth <kergoth> 2003-01-16 18:06:02 (UTC)
committer: kergoth <kergoth> 2003-01-16 18:06:02 (UTC)
commit: c984baa73724d079076b28788c174ce9fa83fdb5 (patch) (unidiff)
tree: af0d37330ebc9f00804d4a47d5d059832d31b44b
parent: 3904d85eac20dfd21cf2a3245977f9946865fd92 (diff)
download: opie-c984baa73724d079076b28788c174ce9fa83fdb5.zip
opie-c984baa73724d079076b28788c174ce9fa83fdb5.tar.gz
opie-c984baa73724d079076b28788c174ce9fa83fdb5.tar.bz2
5 files changed, 112 insertions, 381 deletions
diff --git a/Makefile b/Makefile
index a22669a..2741105 100644
--- a/Makefile
+++ b/Makefile
@@ -1,136 +1,113 @@
-hehindefault:  dynamic
+#!/usr/bin/make -f
+export OPIEDIR:=$(shell pwd)
+export TOPDIR:=$(OPIEDIR)
+export QMAKE:=$(OPIEDIR)/qmake/qmake
+export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
-all: default docs
+noconfig_targets := xconfig menuconfig config oldconfig randconfig \
+                    defconfig allyesconfig allnoconfig allmodconfig \
+                    clean-configs
-LIBS=library libopie
+configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
+# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
+# in order to have a full set of config.in files.
+# .depends depends on $(TOPDIR)/.config
+# everything else depends on .depends, to ensure the dependencies are
+# intact.
+#
+# NOTE: The order in which things happen in this makefile is
+        # -critical-. Do not rearrange this!
+ 
+all : $(TOPDIR)/.config
-INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
+$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
-        inputmethods/handwriting  inputmethods/unikeyboard \
-        inputmethods/jumpx inputmethods/kjumpx \
-        inputmethods/dvorak  inputmethods/multikey \
-APPLETS= core/applets/batteryapplet \
+all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
-        core/applets/irdaapplet core/applets/volumeapplet \
-        core/applets/clockapplet \
-        core/applets/homeapplet core/applets/suspendapplet \
-        core/applets/logoutapplet \
-        core/applets/screenshotapplet core/applets/clipboardapplet \
-        core/applets/cardmon core/applets/obex \
-        core/applets/vmemo \
-        noncore/applets/wirelessapplet noncore/applets/notesapplet
-MAIL= noncore/mail/libmail noncore/mail/bend 
+clean-configs :
+        @echo "Wiping generated config.in files..."
+        @-rm -f $(configs)
-PLAYER = core/multimedia/opieplayer/libmpeg3 \
+-include $(TOPDIR)/.depends.cfgs
-        core/multimedia/opieplayer/libmad \
-        core/multimedia/opieplayer/wavplugin \
-        core/multimedia/opieplayer/modplug
-        COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
+all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
+$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
+        $(call descend,scripts/kconfig,conf)
+        @if [ ! -e $@ ]; then \
+                cp $(TOPDIR)/def-configs/opie $@; \
+        fi;
+        @$(MAKE) -C scripts/kconfig conf;
+        ./scripts/kconfig/conf -s ./config.in
-PIMAPPS = core/pim/addressbook core/pim/datebook \
+# config rules must have the $(configs) var defined
-         core/pim/today core/pim/todo 
+# at the time that they run. we must ensure that .depends.cfgs
+# is built and included by the time we reach this point.
-TODAYPLUGINS = core/pim/today/plugins/datebook \
+xconfig :
-                core/pim/today/plugins/addressbook \
+        $(call descend,scripts/kconfig,qconf)
-                core/pim/today/plugins/todolist \
+        LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
-                core/pim/today/plugins/mail \
+                ./scripts/kconfig/qconf ./config.in
-                noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
-                noncore/todayplugins/fortune \
-                noncore/todayplugins/weather
+menuconfig : scripts/lxdialog/lxdialog
+        $(call descend,scripts/kconfig,mconf)
+        ./scripts/kconfig/mconf ./config.in
-COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
+config :
-        core/apps/textedit core/apps/embeddedkonsole \
+        $(call descend,scripts/kconfig,conf)
-        core/launcher  \
+        ./scripts/kconfig/conf ./config.in
-        core/opie-login \
+ 
-        core/apps/oipkg core/apps/qcop
+oldconfig :
+        $(call descend,scripts/kconfig,conf)
+        ./scripts/kconfig/conf -o ./config.in
+ 
+randconfig :
+        $(call descend,scripts/kconfig,conf)
+        ./scripts/kconfig/conf -r ./config.in
+ 
+allyesconfig :
+        $(call descend,scripts/kconfig,conf)
+        ./scripts/kconfig/conf -y ./config.in
+ 
+allnoconfig :
+        $(call descend,scripts/kconfig,conf)
+        ./scripts/kconfig/conf -n ./config.in
+ 
+defconfig :
+        $(call descend,scripts/kconfig,conf)
+        ./scripts/kconfig/conf -d ./config.in
-COREMULTIMEDIA = core/multimedia/opieplayer
-CORESETTINGS = core/settings/light-and-power core/settings/security \
+export
-        noncore/settings/netsystemtime core/settings/citytime \
-        core/settings/launcher core/settings/button
-NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-        noncore/settings/appearance2 noncore/settings/sound \
-        noncore/settings/mediummount \
-        noncore/settings/tabmanager \
-        noncore/settings/sshkeys noncore/settings/usermanager \
-        noncore/settings/backup
-NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
+export include-config := 1
-         noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
-         noncore/tools/formatter
-NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
+-include $(TOPDIR)/.config
-        noncore/styles/flat noncore/styles/fresh
+-include $(TOPDIR)/.depends
-NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
+endif
-        noncore/decorations/polished
-GAMES = noncore/games/minesweep noncore/games/solitaire \
+-include $(TOPDIR)/..config.cmd
-        noncore/games/tetrix noncore/games/wordgame \
-        noncore/games/parashoot noncore/games/snake \
-        noncore/games/mindbreaker \
-        noncore/games/go noncore/games/qasteroids \
-        noncore/games/fifteen noncore/games/tictac \
-        noncore/games/kcheckers noncore/games/kpacman \
-        noncore/games/kbill noncore/games/buzzword \
-        noncore/games/bounce noncore/games/sfcave
-NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
+SUBDIRS = $(subdir-y)
-        noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
-         noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
-         noncore/apps/opie-console noncore/apps/opie-write
-        
-NONNET = noncore/net/ftplib noncore/net/opieftp \
-        noncore/mail
-NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
+export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
-        noncore/graphics/qpdf noncore/apps/confedit
+ifdef CONFIG_OPTIMIZATIONS
+export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
+export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
+endif
-NONCOMM = noncore/comm/keypebble
+all clean lupdate lrelease install ipk: $(SUBDIRS) 
-PLUGINS = freetype
+$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
+        $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
+        $(TOPDIR)/library/custom.h
-APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
+clean : $(TOPDIR)/.config
-        $(COREMULTIMEDIA) $(CORESETTINGS) \
-        $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
-        $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
-        $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
-    
-    
-NONTMAKEAPPS := core/opiealarm 
+include $(TOPDIR)/Rules.make
-DOCS = docs/src/opie-policy
-dynamic: $(APPS) $(NONTMAKEAPPS)
-docs: $(DOCS)
-$(COMPONENTS): $(LIBS)
-$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
-$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
-        $(MAKE) -C $@ -f Makefile
-showcomponents:
-        @echo $(LIBS) $(APPS) $(COMPONENTS)
-clean:
-        for dir in $(NONTMAKEAPPS) $(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 $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) showcomponents clean
diff --git a/Makefile.test b/Makefile.test
deleted file mode 100644
index 3fe7867..0000000
--- a/Makefile.test
+++ b/dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/make -f
-export OPIEDIR:=$(shell pwd)
-export TOPDIR:=$(OPIEDIR)
-export QMAKE:=$(OPIEDIR)/qmake/qmake
-export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
-noconfig_targets := xconfig menuconfig config oldconfig randconfig \
-                    defconfig allyesconfig allnoconfig allmodconfig \
-                    clean-configs clean
-configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
-# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
-# in order to have a full set of config.in files.
-# .depends depends on $(TOPDIR)/.config
-# everything else depends on .depends, to ensure the dependencies are
-# intact.
-#
-# NOTE: The order in which things happen in this makefile is
-        # -critical-. Do not rearrange this!
- 
-all : $(TOPDIR)/.config
-$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
-all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
-clean-configs :
-        @echo "Wiping generated config.in files..."
-        @-rm -f $(configs)
-include $(TOPDIR)/.depends.cfgs
-all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
-$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
-        $(call descend,scripts/kconfig,conf)
-        @if [ ! -e $@ ]; then \
-                cp $(TOPDIR)/def-configs/opie $@; \
-        fi;
-        @$(MAKE) -C scripts/kconfig conf;
-        ./scripts/kconfig/conf -s ./config.in
-# config rules must have the $(configs) var defined
-# at the time that they run. we must ensure that .depends.cfgs
-# is built and included by the time we reach this point.
-xconfig :
-        $(call descend,scripts/kconfig,qconf)
-        LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
-                ./scripts/kconfig/qconf ./config.in
-menuconfig : scripts/lxdialog/lxdialog
-        $(call descend,scripts/kconfig,mconf)
-        ./scripts/kconfig/mconf ./config.in
-config :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf ./config.in
- 
-oldconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -o ./config.in
- 
-randconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -r ./config.in
- 
-allyesconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -y ./config.in
- 
-allnoconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -n ./config.in
- 
-defconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -d ./config.in
-export
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-export include-config := 1
-include $(TOPDIR)/.config
-include $(TOPDIR)/.depends
-endif
-include $(TOPDIR)/..config.cmd
-SUBDIRS = $(subdir-y)
-export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
-ifdef CONFIG_OPTIMIZATIONS
-export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
-export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
-endif
-all clean lupdate lrelease install ipk: $(SUBDIRS) 
-$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
-        $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
-        $(TOPDIR)/library/custom.h
-clean : $(TOPDIR)/.config
-include $(TOPDIR)/Rules.make
diff --git a/Makefile.x11 b/Makefile.x11
deleted file mode 100644
index 9aa96da..0000000
--- a/Makefile.x11
+++ b/dev/null
@@ -1,132 +0,0 @@
-indefault:  dynamic
-all: default docs
-LIBS=x11/libqpe-x11 libopie
-INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
-        inputmethods/handwriting  inputmethods/unikeyboard \
-        inputmethods/jumpx inputmethods/kjumpx \
-        inputmethods/dvorak  inputmethods/multikey \
-APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
-        core/applets/irdaapplet core/applets/volumeapplet \
-        core/applets/clockapplet core/applets/netmonapplet \
-        core/applets/homeapplet core/applets/suspendapplet \
-        core/applets/logoutapplet \
-        core/applets/screenshotapplet core/applets/clipboardapplet \
-        core/applets/cardmon core/applets/obex \
-        core/applets/vmemo noncore/net/netsetup/dialup \
-        noncore/net/netsetup/lan  \
-        noncore/applets/wirelessapplet noncore/applets/notesapplet
-MAIL= noncore/mail/libmail noncore/mail/bend 
-PLAYER = core/multimedia/opieplayer/libmpeg3 \
-        core/multimedia/opieplayer/libmad \
-        core/multimedia/opieplayer/wavplugin \
-        core/multimedia/opieplayer/modplug
-        COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
-PIMAPPS = core/pim/addressbook core/pim/datebook \
-         core/pim/today core/pim/todo 
-TODAYPLUGINS = core/pim/today/plugins/datebook \
-                core/pim/today/plugins/todolist \
-                core/pim/today/plugins/mail \
-COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
-        core/apps/textedit core/apps/embeddedkonsole \
-        core/launcher  \
-        core/opie-login \
-        core/apps/oipkg core/apps/qcop
-COREMULTIMEDIA = core/multimedia/opieplayer
-CORESETTINGS = core/settings/light-and-power core/settings/security \
-        noncore/settings/netsystemtime core/settings/citytime \
-        core/settings/launcher
-NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
-        noncore/settings/appearance2 noncore/settings/sound \
-        noncore/settings/mediummount \
-        noncore/settings/tabmanager noncore/settings/appskey \
-        noncore/settings/wlansetup \
-        noncore/settings/sshkeys noncore/settings/usermanager \
-        noncore/apps/backup
-NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
-         noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm
-NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
-        noncore/styles/flat noncore/styles/fresh
-NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
-        noncore/decorations/polished
-GAMES = noncore/games/minesweep noncore/games/solitaire \
-        noncore/games/tetrix noncore/games/wordgame \
-        noncore/games/parashoot noncore/games/snake \
-        noncore/games/mindbreaker \
-        noncore/games/go noncore/games/qasteroids \
-        noncore/games/fifteen noncore/games/tictac \
-        noncore/games/kcheckers noncore/games/kpacman \
-        noncore/games/kbill noncore/games/buzzword \
-        noncore/games/bounce 
-NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
-        noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
-        noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
-        
-NONNET = noncore/net/netsetup noncore/net/opieftp \
-        noncore/mail
-NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
-        noncore/graphics/qpdf noncore/apps/confedit
-NONCOMM = noncore/comm/keypebble
-APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
-        $(CORESETTINGS) \
-        $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
-        $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
-        $(NONCOMM) $(GAMES) $(TODAYPLUGINS)
-    
-    
-NONTMAKEAPPS := root/opiealarm 
-DOCS = docs/src/opie-policy
-single: mpegplayer/libmpeg3
-dynamic: $(APPS) $(NONTMAKEAPPS)
-docs: $(DOCS)
-$(COMPONENTS): $(LIBS)
-$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
-$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
-        $(MAKE) -C $@ -f Makefile
-showcomponents:
-        @echo $(LIBS) $(APPS) $(COMPONENTS) single
-clean:
-        $(MAKE) -C single -f Makefile $@
-        for dir in $(NONTMAKEAPPS) $(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 $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
diff --git a/README b/README
index a19da4a..e533725 100644
--- a/README
+++ b/README
@@ -1 +1,26 @@
-See http://opie.handhelds.org or docs/ or website/index.html for docs.
+How to use the new build system
+===============================
+WARNING: This buildsystem is currently under construction. Therefore
+         it may create more problems than solutions .. ;)
+But if you have problems with the old one, you may use the new which
+is much more advanced:
+First of all set you shell-variables to the correct settings 
+( as you need for the old build system )
+Then do the following:
+cd $OPIEDIR
+make clean
+ln -s Makefile.test GNUmakefile
+cp def-configs/opie .config
+make menuconfig
+Now you can move through the menu and select or deselect anything..
+Exit and save the configuration and enter "make" to create opie...
+Have fun with it !
+Ciao, Stefan
+\ No newline at end of file
diff --git a/README.NEWBUILD b/README.NEWBUILD
deleted file mode 100644
index e533725..0000000
--- a/README.NEWBUILD
+++ b/dev/null
@@ -1,26 +0,0 @@
-How to use the new build system
-===============================
-WARNING: This buildsystem is currently under construction. Therefore
-         it may create more problems than solutions .. ;)
-But if you have problems with the old one, you may use the new which
-is much more advanced:
-First of all set you shell-variables to the correct settings 
-( as you need for the old build system )
-Then do the following:
-cd $OPIEDIR
-make clean
-ln -s Makefile.test GNUmakefile
-cp def-configs/opie .config
-make menuconfig
-Now you can move through the menu and select or deselect anything..
-Exit and save the configuration and enter "make" to create opie...
-Have fun with it !
-Ciao, Stefan
-\ No newline at end of file
author	kergoth <kergoth>	2003-01-16 18:06:02 (UTC)
committer	kergoth <kergoth>	2003-01-16 18:06:02 (UTC)
commit	c984baa73724d079076b28788c174ce9fa83fdb5 (patch) (unidiff)
tree	af0d37330ebc9f00804d4a47d5d059832d31b44b
parent	3904d85eac20dfd21cf2a3245977f9946865fd92 (diff)
download	opie-c984baa73724d079076b28788c174ce9fa83fdb5.zip opie-c984baa73724d079076b28788c174ce9fa83fdb5.tar.gz opie-c984baa73724d079076b28788c174ce9fa83fdb5.tar.bz2

diff --git a/Makefile b/Makefile index a22669a..2741105 100644 --- a/Makefile +++ b/Makefile
@@ -1,136 +1,113 @@
1	hehindefault: dynamic	1	#!/usr/bin/make -f
		2	export OPIEDIR:=$(shell pwd)
		3	export TOPDIR:=$(OPIEDIR)
		4	export QMAKE:=$(OPIEDIR)/qmake/qmake
		5
		6	export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
2		7
3	all: default docs	8	noconfig_targets := xconfig menuconfig config oldconfig randconfig \
		9	defconfig allyesconfig allnoconfig allmodconfig \
		10	clean-configs
4		11
5	LIBS=library libopie	12	configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
6		13
		14	# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
		15	# in order to have a full set of config.in files.
		16	# .depends depends on $(TOPDIR)/.config
		17	# everything else depends on .depends, to ensure the dependencies are
		18	# intact.
		19	#
		20	# NOTE: The order in which things happen in this makefile is
		21	# -critical-. Do not rearrange this!
		22
		23	all : $(TOPDIR)/.config
7		24
8	INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \	25	$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
9	inputmethods/handwriting inputmethods/unikeyboard \
10	inputmethods/jumpx inputmethods/kjumpx \
11	inputmethods/dvorak inputmethods/multikey \
12		26
13	APPLETS= core/applets/batteryapplet \	27	all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
14	core/applets/irdaapplet core/applets/volumeapplet \
15	core/applets/clockapplet \
16	core/applets/homeapplet core/applets/suspendapplet \
17	core/applets/logoutapplet \
18	core/applets/screenshotapplet core/applets/clipboardapplet \
19	core/applets/cardmon core/applets/obex \
20	core/applets/vmemo \
21	noncore/applets/wirelessapplet noncore/applets/notesapplet
22		28
23	MAIL= noncore/mail/libmail noncore/mail/bend	29	clean-configs :
		30	@echo "Wiping generated config.in files..."
		31	@-rm -f $(configs)
24		32
25	PLAYER = core/multimedia/opieplayer/libmpeg3 \	33	-include $(TOPDIR)/.depends.cfgs
26	core/multimedia/opieplayer/libmad \
27	core/multimedia/opieplayer/wavplugin \
28	core/multimedia/opieplayer/modplug
29		34
30	COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)	35	all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
31		36
		37	$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
		38	$(call descend,scripts/kconfig,conf)
		39	@if [ ! -e $@ ]; then \
		40	cp $(TOPDIR)/def-configs/opie $@; \
		41	fi;
		42	@$(MAKE) -C scripts/kconfig conf;
		43	./scripts/kconfig/conf -s ./config.in
32		44
33	PIMAPPS = core/pim/addressbook core/pim/datebook \	45	# config rules must have the $(configs) var defined
34	core/pim/today core/pim/todo	46	# at the time that they run. we must ensure that .depends.cfgs
		47	# is built and included by the time we reach this point.
35		48
36	TODAYPLUGINS = core/pim/today/plugins/datebook \	49	xconfig :
37	core/pim/today/plugins/addressbook \	50	$(call descend,scripts/kconfig,qconf)
38	core/pim/today/plugins/todolist \	51	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
39	core/pim/today/plugins/mail \	52	./scripts/kconfig/qconf ./config.in
40	noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
41	noncore/todayplugins/fortune \
42	noncore/todayplugins/weather
43		53
		54	menuconfig : scripts/lxdialog/lxdialog
		55	$(call descend,scripts/kconfig,mconf)
		56	./scripts/kconfig/mconf ./config.in
44		57
45	COREAPPS = core/apps/filebrowser core/apps/helpbrowser \	58	config :
46	core/apps/textedit core/apps/embeddedkonsole \	59	$(call descend,scripts/kconfig,conf)
47	core/launcher \	60	./scripts/kconfig/conf ./config.in
48	core/opie-login \	61
49	core/apps/oipkg core/apps/qcop	62	oldconfig :
		63	$(call descend,scripts/kconfig,conf)
		64	./scripts/kconfig/conf -o ./config.in
		65
		66	randconfig :
		67	$(call descend,scripts/kconfig,conf)
		68	./scripts/kconfig/conf -r ./config.in
		69
		70	allyesconfig :
		71	$(call descend,scripts/kconfig,conf)
		72	./scripts/kconfig/conf -y ./config.in
		73
		74	allnoconfig :
		75	$(call descend,scripts/kconfig,conf)
		76	./scripts/kconfig/conf -n ./config.in
		77
		78	defconfig :
		79	$(call descend,scripts/kconfig,conf)
		80	./scripts/kconfig/conf -d ./config.in
50		81
51	COREMULTIMEDIA = core/multimedia/opieplayer
52		82
53	CORESETTINGS = core/settings/light-and-power core/settings/security \	83	export
54	noncore/settings/netsystemtime core/settings/citytime \
55	core/settings/launcher core/settings/button
56		84
57	NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \	85	ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
58	noncore/settings/appearance2 noncore/settings/sound \
59	noncore/settings/mediummount \
60	noncore/settings/tabmanager \
61	noncore/settings/sshkeys noncore/settings/usermanager \
62	noncore/settings/backup
63		86
64	NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \	87	export include-config := 1
65	noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
66	noncore/tools/formatter
67		88
68	NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \	89	-include $(TOPDIR)/.config
69	noncore/styles/flat noncore/styles/fresh	90	-include $(TOPDIR)/.depends
70		91
71	NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \	92	endif
72	noncore/decorations/polished
73		93
74	GAMES = noncore/games/minesweep noncore/games/solitaire \	94	-include $(TOPDIR)/..config.cmd
75	noncore/games/tetrix noncore/games/wordgame \
76	noncore/games/parashoot noncore/games/snake \
77	noncore/games/mindbreaker \
78	noncore/games/go noncore/games/qasteroids \
79	noncore/games/fifteen noncore/games/tictac \
80	noncore/games/kcheckers noncore/games/kpacman \
81	noncore/games/kbill noncore/games/buzzword \
82	noncore/games/bounce noncore/games/sfcave
83		95
84	NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \	96	SUBDIRS = $(subdir-y)
85	noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
86	noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
87	noncore/apps/opie-console noncore/apps/opie-write
88
89	NONNET = noncore/net/ftplib noncore/net/opieftp \
90	noncore/mail
91		97
92	NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \	98	export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
93	noncore/graphics/qpdf noncore/apps/confedit
94		99
		100	ifdef CONFIG_OPTIMIZATIONS
		101	export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
		102	export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
		103	endif
95		104
96	NONCOMM = noncore/comm/keypebble	105	all clean lupdate lrelease install ipk: $(SUBDIRS)
97		106
98	PLUGINS = freetype	107	$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
		108	$(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
		109	$(TOPDIR)/library/custom.h
99		110
100	APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \	111	clean : $(TOPDIR)/.config
101	$(COREMULTIMEDIA) $(CORESETTINGS) \
102	$(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
103	$(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
104	$(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
105
106
107		112
108	NONTMAKEAPPS := core/opiealarm	113	include $(TOPDIR)/Rules.make
109
110	DOCS = docs/src/opie-policy
111
112	dynamic: $(APPS) $(NONTMAKEAPPS)
113
114	docs: $(DOCS)
115
116	$(COMPONENTS): $(LIBS)
117
118	$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
119
120	$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
121	$(MAKE) -C $@ -f Makefile
122
123	showcomponents:
124	@echo $(LIBS) $(APPS) $(COMPONENTS)
125
126	clean:
127	for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
128
129	lupdate:
130	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
131
132	lrelease:
133	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
134
135
136	.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) showcomponents clean


diff --git a/Makefile.test b/Makefile.test deleted file mode 100644 index 3fe7867..0000000 --- a/Makefile.test +++ b/dev/null
@@ -1,113 +0,0 @@
1	#!/usr/bin/make -f
2	export OPIEDIR:=$(shell pwd)
3	export TOPDIR:=$(OPIEDIR)
4	export QMAKE:=$(OPIEDIR)/qmake/qmake
5
6	export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
7
8	noconfig_targets := xconfig menuconfig config oldconfig randconfig \
9	defconfig allyesconfig allnoconfig allmodconfig \
10	clean-configs clean
11
12	configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in
13
14	# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
15	# in order to have a full set of config.in files.
16	# .depends depends on $(TOPDIR)/.config
17	# everything else depends on .depends, to ensure the dependencies are
18	# intact.
19	#
20	# NOTE: The order in which things happen in this makefile is
21	# -critical-. Do not rearrange this!
22
23	all : $(TOPDIR)/.config
24
25	$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
26
27	all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
28
29	clean-configs :
30	@echo "Wiping generated config.in files..."
31	@-rm -f $(configs)
32
33	-include $(TOPDIR)/.depends.cfgs
34
35	all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
36
37	$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
38	$(call descend,scripts/kconfig,conf)
39	@if [ ! -e $@ ]; then \
40	cp $(TOPDIR)/def-configs/opie $@; \
41	fi;
42	@$(MAKE) -C scripts/kconfig conf;
43	./scripts/kconfig/conf -s ./config.in
44
45	# config rules must have the $(configs) var defined
46	# at the time that they run. we must ensure that .depends.cfgs
47	# is built and included by the time we reach this point.
48
49	xconfig :
50	$(call descend,scripts/kconfig,qconf)
51	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
52	./scripts/kconfig/qconf ./config.in
53
54	menuconfig : scripts/lxdialog/lxdialog
55	$(call descend,scripts/kconfig,mconf)
56	./scripts/kconfig/mconf ./config.in
57
58	config :
59	$(call descend,scripts/kconfig,conf)
60	./scripts/kconfig/conf ./config.in
61
62	oldconfig :
63	$(call descend,scripts/kconfig,conf)
64	./scripts/kconfig/conf -o ./config.in
65
66	randconfig :
67	$(call descend,scripts/kconfig,conf)
68	./scripts/kconfig/conf -r ./config.in
69
70	allyesconfig :
71	$(call descend,scripts/kconfig,conf)
72	./scripts/kconfig/conf -y ./config.in
73
74	allnoconfig :
75	$(call descend,scripts/kconfig,conf)
76	./scripts/kconfig/conf -n ./config.in
77
78	defconfig :
79	$(call descend,scripts/kconfig,conf)
80	./scripts/kconfig/conf -d ./config.in
81
82
83	export
84
85	ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
86
87	export include-config := 1
88
89	-include $(TOPDIR)/.config
90	-include $(TOPDIR)/.depends
91
92	endif
93
94	-include $(TOPDIR)/..config.cmd
95
96	SUBDIRS = $(subdir-y)
97
98	export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
99
100	ifdef CONFIG_OPTIMIZATIONS
101	export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
102	export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
103	endif
104
105	all clean lupdate lrelease install ipk: $(SUBDIRS)
106
107	$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
108	$(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
109	$(TOPDIR)/library/custom.h
110
111	clean : $(TOPDIR)/.config
112
113	include $(TOPDIR)/Rules.make


diff --git a/Makefile.x11 b/Makefile.x11 deleted file mode 100644 index 9aa96da..0000000 --- a/Makefile.x11 +++ b/dev/null
@@ -1,132 +0,0 @@
1	indefault: dynamic
2
3	all: default docs
4
5	LIBS=x11/libqpe-x11 libopie
6
7
8	INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
9	inputmethods/handwriting inputmethods/unikeyboard \
10	inputmethods/jumpx inputmethods/kjumpx \
11	inputmethods/dvorak inputmethods/multikey \
12
13	APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
14	core/applets/irdaapplet core/applets/volumeapplet \
15	core/applets/clockapplet core/applets/netmonapplet \
16	core/applets/homeapplet core/applets/suspendapplet \
17	core/applets/logoutapplet \
18	core/applets/screenshotapplet core/applets/clipboardapplet \
19	core/applets/cardmon core/applets/obex \
20	core/applets/vmemo noncore/net/netsetup/dialup \
21	noncore/net/netsetup/lan \
22	noncore/applets/wirelessapplet noncore/applets/notesapplet
23
24	MAIL= noncore/mail/libmail noncore/mail/bend
25
26	PLAYER = core/multimedia/opieplayer/libmpeg3 \
27	core/multimedia/opieplayer/libmad \
28	core/multimedia/opieplayer/wavplugin \
29	core/multimedia/opieplayer/modplug
30
31	COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
32
33
34	PIMAPPS = core/pim/addressbook core/pim/datebook \
35	core/pim/today core/pim/todo
36
37	TODAYPLUGINS = core/pim/today/plugins/datebook \
38	core/pim/today/plugins/todolist \
39	core/pim/today/plugins/mail \
40
41
42	COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
43	core/apps/textedit core/apps/embeddedkonsole \
44	core/launcher \
45	core/opie-login \
46	core/apps/oipkg core/apps/qcop
47
48	COREMULTIMEDIA = core/multimedia/opieplayer
49
50	CORESETTINGS = core/settings/light-and-power core/settings/security \
51	noncore/settings/netsystemtime core/settings/citytime \
52	core/settings/launcher
53
54	NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
55	noncore/settings/appearance2 noncore/settings/sound \
56	noncore/settings/mediummount \
57	noncore/settings/tabmanager noncore/settings/appskey \
58	noncore/settings/wlansetup \
59	noncore/settings/sshkeys noncore/settings/usermanager \
60	noncore/apps/backup
61
62	NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
63	noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm
64
65	NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
66	noncore/styles/flat noncore/styles/fresh
67
68	NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
69	noncore/decorations/polished
70
71	GAMES = noncore/games/minesweep noncore/games/solitaire \
72	noncore/games/tetrix noncore/games/wordgame \
73	noncore/games/parashoot noncore/games/snake \
74	noncore/games/mindbreaker \
75	noncore/games/go noncore/games/qasteroids \
76	noncore/games/fifteen noncore/games/tictac \
77	noncore/games/kcheckers noncore/games/kpacman \
78	noncore/games/kbill noncore/games/buzzword \
79	noncore/games/bounce
80
81	NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
82	noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
83	noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
84
85	NONNET = noncore/net/netsetup noncore/net/opieftp \
86	noncore/mail
87
88	NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
89	noncore/graphics/qpdf noncore/apps/confedit
90
91
92	NONCOMM = noncore/comm/keypebble
93
94	APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
95	$(CORESETTINGS) \
96	$(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
97	$(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
98	$(NONCOMM) $(GAMES) $(TODAYPLUGINS)
99
100
101
102	NONTMAKEAPPS := root/opiealarm
103
104	DOCS = docs/src/opie-policy
105	single: mpegplayer/libmpeg3
106
107	dynamic: $(APPS) $(NONTMAKEAPPS)
108
109	docs: $(DOCS)
110
111	$(COMPONENTS): $(LIBS)
112
113	$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
114
115	$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
116	$(MAKE) -C $@ -f Makefile
117
118	showcomponents:
119	@echo $(LIBS) $(APPS) $(COMPONENTS) single
120
121	clean:
122	$(MAKE) -C single -f Makefile $@
123	for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
124
125	lupdate:
126	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
127
128	lrelease:
129	for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ \|\| exit 1; done
130
131
132	.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean


diff --git a/README b/README index a19da4a..e533725 100644 --- a/README +++ b/README
@@ -1 +1,26 @@
1	See http://opie.handhelds.org or docs/ or website/index.html for docs.	1	How to use the new build system
		2	===============================
		3
		4	WARNING: This buildsystem is currently under construction. Therefore
		5	it may create more problems than solutions .. ;)
		6
		7	But if you have problems with the old one, you may use the new which
		8	is much more advanced:
		9
		10	First of all set you shell-variables to the correct settings
		11	( as you need for the old build system )
		12
		13	Then do the following:
		14
		15	cd $OPIEDIR
		16	make clean
		17	ln -s Makefile.test GNUmakefile
		18	cp def-configs/opie .config
		19	make menuconfig
		20
		21	Now you can move through the menu and select or deselect anything..
		22	Exit and save the configuration and enter "make" to create opie...
		23
		24	Have fun with it !
		25
		26	Ciao, Stefan \ No newline at end of file


diff --git a/README.NEWBUILD b/README.NEWBUILD deleted file mode 100644 index e533725..0000000 --- a/README.NEWBUILD +++ b/dev/null
@@ -1,26 +0,0 @@
1	How to use the new build system
2	===============================
3
4	WARNING: This buildsystem is currently under construction. Therefore
5	it may create more problems than solutions .. ;)
6
7	But if you have problems with the old one, you may use the new which
8	is much more advanced:
9
10	First of all set you shell-variables to the correct settings
11	( as you need for the old build system )
12
13	Then do the following:
14
15	cd $OPIEDIR
16	make clean
17	ln -s Makefile.test GNUmakefile
18	cp def-configs/opie .config
19	make menuconfig
20
21	Now you can move through the menu and select or deselect anything..
22	Exit and save the configuration and enter "make" to create opie...
23
24	Have fun with it !
25
26	Ciao, Stefan \ No newline at end of file