custom.h rule

3 files changed, 16 insertions, 10 deletions

diff --git a/Makefile.test b/Makefile.test
index a98eb0d..9af15dc 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,94 +1,90 @@
 #!/usr/bin/make -f
 export OPIEDIR:=$(shell pwd)
 export TOPDIR:=$(OPIEDIR)
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
 configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(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)/core/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/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/config.in $(TOPDIR)/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
 
 clean-configs : $(TOPDIR)/.depends.cfgs
 	@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
 
 
-ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
 -include $(TOPDIR)/.config
-endif
-ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
 -include $(TOPDIR)/..config.cmd
-endif
-ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
 -include $(TOPDIR)/.depends
-endif
 
 export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
-all : $(subdir-y)
+all clean: $(subdir-y)
 
-$(subdir-y) : $(TOPDIR)/stamp-headers
+$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h
+
+clean : $(TOPDIR)/.config
 
 include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index ead629f..c3a9041 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,62 +1,67 @@
 ## targets ##
 
 $(configs) :
 	$(call makecfg,$@)
 
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
 	@echo Generating dependency information...
 # add to subdir-y, and add descend rules
 	cat $(TOPDIR)/packages | grep -v '^#' | \
 		awk '{print \
 			".PHONY : " $$2 "\n" \
 			"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
-			print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"; }' > $(TOPDIR)/.depends
+			print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(MAKECMDGOALS)))\n"; }' > $(TOPDIR)/.depends
 	cat $(TOPDIR)/packages | grep -v '^#' | \
 		perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(TOPDIR)/qmake/qmake\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
 			>> $(TOPDIR)/.depends
 # interpackage dependency generation
 	cat $(TOPDIR)/packages | \
 		$(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
 	@echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
 	@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 ) >> $@
 	@-rm -f dirs
 
 $(TOPDIR)/stamp-headers :
 	mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
 		$(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
 	( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
 	( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
 	( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 	( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
 	( cd include/opie &&  ln -sf ../../libsql/*.h .; )
 	( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
 	( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
 	ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
 	touch $@
 	
-	
+$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
+	@-rm -f $@
+	$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
+		ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\
+		touch $@\
+	)
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
 	$(call descend,$(shell dirname $@),$(shell basename $@))
 
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 
 $(TOPDIR)/mkspecs/default :
 	ln -sf linux-g++ $@
 
 ## general rules ##
 
 define descend
 	$(MAKE) -C $(1) $(2)
 endef
 
 define makefilegen
 	cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro
 endef
 
 define makecfg
 	$(TOPDIR)/scripts/makecfg.pl $1
 endef
diff --git a/config.in.in b/config.in.in
index 2de0cbc..41998d4 100644
--- a/config.in.in
+++ b/config.in.in
@@ -1,54 +1,59 @@
 mainmenu "Opie Configuration"
 menu "Build Parameters"
 
 #choice
 # prompt "Build Processor family"
 #  default BUILD_X86
 #  help
 #    Please select the architecture of the machine you will be
 #    building the OpenZaurus buildroot on.
 #
 #  config BUILD_X86
 #    boolean "X86 Architecture"
 #
 #endchoice
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
     boolean "Ipaq"
 
 endchoice
 
 config SPECFILE
   string
   default "linux-generic-g++" if TARGET_X86
   default "linux-sharp-g++" if TARGET_SHARP
 #  default "linux-oz-g++" if TARGET_OZ
   default "linux-ipaq-g++" if TARGET_IPAQ
 
+config CUSTOMFILE
+  string
+  default "custom-ipaq.h" if TARGET_IPAQ
+  default "custom-sharp.h" if TARGET_SHARP
+  
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 endmenu
 
 @sources@