summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 21:21:19 (UTC)
committer kergoth <kergoth>2002-11-05 21:21:19 (UTC)
commit29d8b412c02963b58482a9e58e23becb8f18fa0d (patch) (side-by-side diff)
treee050191ff73849c05492ba419334af480cb64fd4
parentc9d9315e03afba63853a10dec16a6a9dea3a5c4e (diff)
downloadopie-29d8b412c02963b58482a9e58e23becb8f18fa0d.zip
opie-29d8b412c02963b58482a9e58e23becb8f18fa0d.tar.gz
opie-29d8b412c02963b58482a9e58e23becb8f18fa0d.tar.bz2
Obey our new specfile config parameter
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.test b/Makefile.test
index 6753ee1..61d8a56 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,30 +1,29 @@
#!/usr/bin/make -f
export OPIEDIR:=$(shell pwd)
export TOPDIR:=$(OPIEDIR)
export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
-export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
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)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/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
clean-configs : $(TOPDIR)/.depends.cfgs
@echo "Wiping generated config.in files..."
@-rm -f $(configs)
-include $(TOPDIR)/.depends.cfgs
@@ -64,30 +63,31 @@ 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
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/$(CONFIG_SPECFILE)
+
all : $(subdir-y)
$(subdir-y) : $(TOPDIR)/stamp-headers
-
include $(TOPDIR)/Rules.make