summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -35,17 +35,17 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
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
@@ -70,25 +70,21 @@ 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 $(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
@@ -5,17 +5,17 @@ $(configs) :
$(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:
@@ -32,17 +32,22 @@ $(TOPDIR)/stamp-headers :
( 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++ $@
diff --git a/config.in.in b/config.in.in
index 2de0cbc..41998d4 100644
--- a/config.in.in
+++ b/config.in.in
@@ -36,16 +36,21 @@ 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.