summaryrefslogtreecommitdiff
Unidiff
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)
41# at the time that they run. we must ensure that .depends.cfgs 41# at the time that they run. we must ensure that .depends.cfgs
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
44xconfig : 44xconfig :
45 $(call descend,scripts/kconfig,qconf) 45 $(call descend,scripts/kconfig,qconf)
@@ -76,19 +76,15 @@ defconfig :
76 76
77 77
78ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
79-include $(TOPDIR)/.config 78-include $(TOPDIR)/.config
80endif
81ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
82-include $(TOPDIR)/..config.cmd 79-include $(TOPDIR)/..config.cmd
83endif
84ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
85-include $(TOPDIR)/.depends 80-include $(TOPDIR)/.depends
86endif
87 81
88export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) 82export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
89 83
90all : $(subdir-y) 84all clean: $(subdir-y)
85
86$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h
91 87
92$(subdir-y) : $(TOPDIR)/stamp-headers 88clean : $(TOPDIR)/.config
93 89
94include $(TOPDIR)/Rules.make 90include $(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)
11 ".PHONY : " $$2 "\n" \ 11 ".PHONY : " $$2 "\n" \
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 '^#' | \
15 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"; }' \ 15 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 :
38 touch $@ 38 touch $@
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
42$(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 : 47$(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
42 default "linux-ipaq-g++" if TARGET_IPAQ 42 default "linux-ipaq-g++" if TARGET_IPAQ
43 43
44config 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
45# string "Crosscompilation prefix" 50# string "Crosscompilation prefix"