summaryrefslogtreecommitdiff
Unidiff
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,18 +1,17 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2export OPIEDIR:=$(shell pwd) 2export OPIEDIR:=$(shell pwd)
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4 4
5export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 5export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
6export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
7 6
8configs += $(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 7configs += $(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
9 8
10# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 9# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
11# in order to have a full set of config.in files. 10# in order to have a full set of config.in files.
12# .depends depends on $(TOPDIR)/.config 11# .depends depends on $(TOPDIR)/.config
13# everything else depends on .depends, to ensure the dependencies are 12# everything else depends on .depends, to ensure the dependencies are
14# intact. 13# intact.
15# 14#
16# NOTE: The order in which things happen in this makefile is 15# NOTE: The order in which things happen in this makefile is
17 # -critical-. Do not rearrange this! 16 # -critical-. Do not rearrange this!
18 17
@@ -76,18 +75,19 @@ defconfig :
76 75
77 76
78ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) 77ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
79-include $(TOPDIR)/.config 78-include $(TOPDIR)/.config
80endif 79endif
81ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists) 80ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
82-include $(TOPDIR)/..config.cmd 81-include $(TOPDIR)/..config.cmd
83endif 82endif
84ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) 83ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
85-include $(TOPDIR)/.depends 84-include $(TOPDIR)/.depends
86endif 85endif
87 86
87export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(CONFIG_SPECFILE)
88
88all : $(subdir-y) 89all : $(subdir-y)
89 90
90$(subdir-y) : $(TOPDIR)/stamp-headers 91$(subdir-y) : $(TOPDIR)/stamp-headers
91 92
92
93include $(TOPDIR)/Rules.make 93include $(TOPDIR)/Rules.make