| -rw-r--r-- | Makefile.test | 12 | ||||
| -rw-r--r-- | Rules.make | 9 | ||||
| -rw-r--r-- | config.in.in | 5 |
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 @@ -74,21 +74,17 @@ 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 @@ -9,9 +9,9 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) 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 @@ -36,9 +36,14 @@ $(TOPDIR)/stamp-headers : ( 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 $@)) diff --git a/config.in.in b/config.in.in index 2de0cbc..41998d4 100644 --- a/config.in.in +++ b/config.in.in @@ -40,8 +40,13 @@ config SPECFILE 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 |