custom.h rule

author: kergoth <kergoth> 2002-11-06 00:23:35 (UTC)
committer: kergoth <kergoth> 2002-11-06 00:23:35 (UTC)
commit: 2129e9cd500a7755062c93f3b9ea325b9368ea37 (patch) (unidiff)
tree: a35fac4ec75b5533142b4aac6a3a708d55e060e9
parent: b461afb1563d0af5cdd1705b61f9c920ad124907 (diff)
download: opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.zip
opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.gz
opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.bz2
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
@@ -42,3 +42,3 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
 # is built and included by the time we reach this point.
-        
 xconfig :
@@ -77,11 +77,5 @@ 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
@@ -89,5 +83,7 @@ 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
diff --git a/Rules.make b/Rules.make
index ead629f..c3a9041 100644
--- a/Rules.make
+++ b/Rules.make
@@ -12,3 +12,3 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
                        "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 '^#' | \
@@ -39,3 +39,8 @@ $(TOPDIR)/stamp-headers :
        
-        
+$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
+        @-rm -f $@
+        $(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
+                ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\
+                touch $@\
+        )
diff --git a/config.in.in b/config.in.in
index 2de0cbc..41998d4 100644
--- a/config.in.in
+++ b/config.in.in
@@ -43,2 +43,7 @@ config SPECFILE
+config CUSTOMFILE
+  string
+  default "custom-ipaq.h" if TARGET_IPAQ
+  default "custom-sharp.h" if TARGET_SHARP
+  
 #config CROSS
author	kergoth <kergoth>	2002-11-06 00:23:35 (UTC)
committer	kergoth <kergoth>	2002-11-06 00:23:35 (UTC)
commit	2129e9cd500a7755062c93f3b9ea325b9368ea37 (patch) (unidiff)
tree	a35fac4ec75b5533142b4aac6a3a708d55e060e9
parent	b461afb1563d0af5cdd1705b61f9c920ad124907 (diff)
download	opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.zip opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.gz opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.bz2

diff --git a/Makefile.test b/Makefile.test index a98eb0d..9af15dc 100644 --- a/Makefile.test +++ b/Makefile.test
@@ -42,3 +42,3 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
42	# is built and included by the time we reach this point.	42	# is built and included by the time we reach this point.
43		43
44	xconfig :	44	xconfig :
@@ -77,11 +77,5 @@ defconfig :
77		77
78	ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
79	-include $(TOPDIR)/.config	78	-include $(TOPDIR)/.config
80	endif
81	ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
82	-include $(TOPDIR)/..config.cmd	79	-include $(TOPDIR)/..config.cmd
83	endif
84	ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
85	-include $(TOPDIR)/.depends	80	-include $(TOPDIR)/.depends
86	endif
87		81
@@ -89,5 +83,7 @@ export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
89		83
90	all : $(subdir-y)	84	all clean: $(subdir-y)
		85
		86	$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h
91		87
92	$(subdir-y) : $(TOPDIR)/stamp-headers	88	clean : $(TOPDIR)/.config
93		89


diff --git a/Rules.make b/Rules.make index ead629f..c3a9041 100644 --- a/Rules.make +++ b/Rules.make
@@ -12,3 +12,3 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
12	"subdir-$$(" $$1 ") += " $$2 "\n\n"; \	12	"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
13	print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"; }' > $(TOPDIR)/.depends	13	print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(MAKECMDGOALS)))\n"; }' > $(TOPDIR)/.depends
14	cat $(TOPDIR)/packages \| grep -v '^#' \| \	14	cat $(TOPDIR)/packages \| grep -v '^#' \| \
@@ -39,3 +39,8 @@ $(TOPDIR)/stamp-headers :
39		39
40		40	$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
		41	@-rm -f $@
		42	$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
		43	ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\
		44	touch $@\
		45	)
41		46


diff --git a/config.in.in b/config.in.in index 2de0cbc..41998d4 100644 --- a/config.in.in +++ b/config.in.in
@@ -43,2 +43,7 @@ config SPECFILE
43		43
		44	config CUSTOMFILE
		45	string
		46	default "custom-ipaq.h" if TARGET_IPAQ
		47	default "custom-sharp.h" if TARGET_SHARP
		48
44	#config CROSS	49	#config CROSS