summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 20:48:06 (UTC)
committer kergoth <kergoth>2002-11-06 20:48:06 (UTC)
commit8887820cee7c8e004a1e065be7a088791f77425a (patch) (unidiff)
treebb2d07376ce85e831e9848427f45350a4b0d5703
parentad01f59f45674484c98032ffecbd1bef9d63c366 (diff)
downloadopie-8887820cee7c8e004a1e065be7a088791f77425a.zip
opie-8887820cee7c8e004a1e065be7a088791f77425a.tar.gz
opie-8887820cee7c8e004a1e065be7a088791f77425a.tar.bz2
Adjust specfile based on x11
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test17
-rw-r--r--config.in.in9
2 files changed, 20 insertions, 6 deletions
diff --git a/Makefile.test b/Makefile.test
index b917c32..daa6d35 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -5,6 +5,12 @@ export QMAKE:=$(OPIEDIR)/qmake/qmake
5 5
6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
7 7
8noconfig_targets := xconfig menuconfig config oldconfig randconfig \
9 defconfig allyesconfig allnoconfig allmodconfig \
10 clean mrproper distclean \
11 help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
12 checkconfig checkhelp checkincludes
13
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)/config.in 14configs += $(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
9 15
10# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 16# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
@@ -78,13 +84,18 @@ defconfig :
78 84
79export 85export
80 86
81ifneq ($(filter-out config menuconfig xconfig randconfig allyesconfig allnoconfig defconfig,$(MAKECMDGOALS)),) 87ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
88
89export include-config := 1
90
82-include $(TOPDIR)/.config 91-include $(TOPDIR)/.config
83-include $(TOPDIR)/..config.cmd
84-include $(TOPDIR)/.depends 92-include $(TOPDIR)/.depends
93
85endif 94endif
86 95
87export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) 96-include $(TOPDIR)/..config.cmd
97
98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
88 99
89all clean: $(subdir-y) 100all clean: $(subdir-y)
90 101
diff --git a/config.in.in b/config.in.in
index 41998d4..7af1f17 100644
--- a/config.in.in
+++ b/config.in.in
@@ -36,10 +36,13 @@ endchoice
36 36
37config SPECFILE 37config SPECFILE
38 string 38 string
39 default "linux-generic-g++" if TARGET_X86 39 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
40 default "linux-sharp-g++" if TARGET_SHARP 40 default "linux-g++" if TARGET_X86 && X11
41 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
42 default "linux-g++" if TARGET_SHARP && X11
41# default "linux-oz-g++" if TARGET_OZ 43# default "linux-oz-g++" if TARGET_OZ
42 default "linux-ipaq-g++" if TARGET_IPAQ 44 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
45 default "linux-g++" if TARGET_IPAQ && X11
43 46
44config CUSTOMFILE 47config CUSTOMFILE
45 string 48 string