author | kergoth <kergoth> | 2002-11-06 00:23:35 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 00:23:35 (UTC) |
commit | 2129e9cd500a7755062c93f3b9ea325b9368ea37 (patch) (side-by-side diff) | |
tree | a35fac4ec75b5533142b4aac6a3a708d55e060e9 | |
parent | b461afb1563d0af5cdd1705b61f9c920ad124907 (diff) | |
download | opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.zip opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.gz opie-2129e9cd500a7755062c93f3b9ea325b9368ea37.tar.bz2 |
custom.h rule
-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 @@ -62,33 +62,29 @@ randconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -r ./config.in allyesconfig : $(call descend,scripts/kconfig,conf) ./scripts/kconfig/conf -y ./config.in 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 +$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h + +clean : $(TOPDIR)/.config include $(TOPDIR)/Rules.make @@ -1,56 +1,61 @@ ## targets ## $(configs) : $(call makecfg,$@) $(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: # config.in interdependencies @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ @-rm -f dirs $(TOPDIR)/stamp-headers : mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) ( 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++ $@ ## general rules ## define descend $(MAKE) -C $(1) $(2) endef define makefilegen diff --git a/config.in.in b/config.in.in index 2de0cbc..41998d4 100644 --- a/config.in.in +++ b/config.in.in @@ -28,27 +28,32 @@ choice # config TARGET_OZ # boolean "Sharp Zaurus SL-5x00 - OpenZaurus" config TARGET_IPAQ boolean "Ipaq" 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. endmenu @sources@ |