4 files changed, 24 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index a85ed57..c33bb00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,136 +1,139 @@
 #!/usr/bin/make -f
 
 export TOPDIR:=$(shell pwd)
 
 include $(TOPDIR)/Vars.make
 ifneq ($(wildcard $(TOPDIR)/Vars.local),)
 include $(TOPDIR)/Vars.local
 endif
 
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
                     defconfig allyesconfig allnoconfig allmodconfig \
                     clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \
                     ipks
 
 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/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
 
 #
 # The IPK creation is a very slow process. If you want to only create some
 # IPKs, e.g. the ones in library, then do
         #make ipks IPK_START=library
 # and then only the *.control files in this directory will be processed
 ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
         @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \
                 prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \
                 preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \
                 postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \
                 postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \
                 echo "Building ipk of $$ctrl"; \
                 cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \
                 done )
 
 $(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)
 
 ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),)
     include $(TOPDIR)/.depends.cfgs
 endif
 
 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
 
 scripts/lxdialog/lxdialog:
         make -C scripts/lxdialog
 
 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)
 
 all clean install ipk: $(SUBDIRS)
+        make -C bin clean
+        make -C lib clean
+        make -C plugins clean
 
 lupdate lrelease:
         @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 opie-lupdate opie-lrelease:
         @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
         $(TOPDIR)/library/custom.h
 
 clean : $(TOPDIR)/.config
 
 apidox : doc/generate_apidox 
 
 include $(TOPDIR)/Rules.make
diff --git a/bin/Makefile b/bin/Makefile
new file mode 100644
index 0000000..09a01c9
--- a/dev/null
+++ b/bin/Makefile
@@ -0,0 +1,13 @@
+clean:
+        @for i in *; do \
+                test "$$i" == "CVS" && continue; \
+                test "$$i" == "Makefile" && continue; \
+                test "$$i" == "README" && continue; \
+                test "$$i" == "getprofile" && continue; \
+                test "$$i" == "opie-reorgfiles" && continue; \
+                test "$$i" == "opie-sh-howto.sh" && continue; \
+                test "$$i" == "qpe-reorgfiles" && continue; \
+                rm $$i; \
+        done
+
+all install ipk lupdate lrelease opie-lupdate opie-lrelease:
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 0000000..34b5057
--- a/dev/null
+++ b/lib/Makefile
@@ -0,0 +1,4 @@
+clean:
+        rm lib*.so*
+
+all install ipk lupdate lrelease opie-lupdate opie-lrelease:
diff --git a/plugins/Makefile b/plugins/Makefile
new file mode 100644
index 0000000..4863bd0
--- a/dev/null
+++ b/plugins/Makefile
@@ -0,0 +1,4 @@
+clean:
+        find -name "*.so*" -print0 | xargs -0 rm -f
+
+all install ipk lupdate lrelease opie-lupdate opie-lrelease: