summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 00:23:35 (UTC)
committer kergoth <kergoth>2002-11-06 00:23:35 (UTC)
commit2129e9cd500a7755062c93f3b9ea325b9368ea37 (patch) (side-by-side diff)
treea35fac4ec75b5533142b4aac6a3a708d55e060e9
parentb461afb1563d0af5cdd1705b61f9c920ad124907 (diff)
downloadopie-2129e9cd500a7755062c93f3b9ea325b9368ea37.zip
opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.gz
opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.bz2
custom.h rule
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test14
-rw-r--r--Rules.make9
-rw-r--r--config.in.in5
3 files changed, 17 insertions, 11 deletions
diff --git a/Makefile.test b/Makefile.test
index a98eb0d..9af15dc 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -41,5 +41,5 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
# 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)
@@ -76,19 +76,15 @@ defconfig :
-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 $(TOPDIR)/library/custom.h
-$(subdir-y) : $(TOPDIR)/stamp-headers
+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
@@ -11,5 +11,5 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
".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"; }' \
@@ -38,5 +38,10 @@ $(TOPDIR)/stamp-headers :
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 :
diff --git a/config.in.in b/config.in.in
index 2de0cbc..41998d4 100644
--- a/config.in.in
+++ b/config.in.in
@@ -42,4 +42,9 @@ config SPECFILE
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"