summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 20:35:42 (UTC)
committer kergoth <kergoth>2002-11-06 20:35:42 (UTC)
commit0fc8aff3c45012e0a45027e13272a7461885081a (patch) (side-by-side diff)
tree4c862d43d1cd0ef6de88cec6476c5de88bf6d860
parent0b11a3d71510993c97910d7efa5e328b93b5b8f2 (diff)
downloadopie-0fc8aff3c45012e0a45027e13272a7461885081a.zip
opie-0fc8aff3c45012e0a45027e13272a7461885081a.tar.gz
opie-0fc8aff3c45012e0a45027e13272a7461885081a.tar.bz2
Only include if not a config target, as the implicit rules causes the user to jump through hoops (right holger? :)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.test b/Makefile.test
index a7ceed4..b917c32 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -7,33 +7,33 @@ export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in
# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
# in order to have a full set of config.in files.
# .depends depends on $(TOPDIR)/.config
# everything else depends on .depends, to ensure the dependencies are
# intact.
#
# NOTE: The order in which things happen in this makefile is
# -critical-. Do not rearrange this!
all : $(TOPDIR)/.config
$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
-all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends
+all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
clean-configs : $(TOPDIR)/.depends.cfgs
@echo "Wiping generated config.in files..."
@-rm -f $(configs)
-include $(TOPDIR)/.depends.cfgs
all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
$(call descend,scripts/kconfig,conf)
@if [ ! -e $@ ]; then \
cp $(TOPDIR)/def-configs/opie $@; \
fi;
@$(MAKE) -C scripts/kconfig conf;
./scripts/kconfig/conf -s ./config.in
@@ -65,31 +65,33 @@ randconfig :
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
export
+ifneq ($(filter-out config menuconfig xconfig randconfig allyesconfig allnoconfig defconfig,$(MAKECMDGOALS)),)
-include $(TOPDIR)/.config
-include $(TOPDIR)/..config.cmd
-include $(TOPDIR)/.depends
+endif
export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
all clean: $(subdir-y)
$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
$(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
$(TOPDIR)/library/custom.h
clean : $(TOPDIR)/.config
include $(TOPDIR)/Rules.make