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
@@ -1,31 +1,37 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2export OPIEDIR:=$(shell pwd) 2export OPIEDIR:=$(shell pwd)
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4export QMAKE:=$(OPIEDIR)/qmake/qmake 4export 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)
11# in order to have a full set of config.in files. 17# in order to have a full set of config.in files.
12# .depends depends on $(TOPDIR)/.config 18# .depends depends on $(TOPDIR)/.config
13# everything else depends on .depends, to ensure the dependencies are 19# everything else depends on .depends, to ensure the dependencies are
14# intact. 20# intact.
15# 21#
16# NOTE: The order in which things happen in this makefile is 22# NOTE: The order in which things happen in this makefile is
17 # -critical-. Do not rearrange this! 23 # -critical-. Do not rearrange this!
18 24
19all : $(TOPDIR)/.config 25all : $(TOPDIR)/.config
20 26
21$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 27$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
22 28
23all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 29all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
24 30
25clean-configs : $(TOPDIR)/.depends.cfgs 31clean-configs : $(TOPDIR)/.depends.cfgs
26 @echo "Wiping generated config.in files..." 32 @echo "Wiping generated config.in files..."
27 @-rm -f $(configs) 33 @-rm -f $(configs)
28 34
29-include $(TOPDIR)/.depends.cfgs 35-include $(TOPDIR)/.depends.cfgs
30 36
31all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 37all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
@@ -57,41 +63,46 @@ config :
57 63
58oldconfig : 64oldconfig :
59 $(call descend,scripts/kconfig,conf) 65 $(call descend,scripts/kconfig,conf)
60 ./scripts/kconfig/conf -o ./config.in 66 ./scripts/kconfig/conf -o ./config.in
61 67
62randconfig : 68randconfig :
63 $(call descend,scripts/kconfig,conf) 69 $(call descend,scripts/kconfig,conf)
64 ./scripts/kconfig/conf -r ./config.in 70 ./scripts/kconfig/conf -r ./config.in
65 71
66allyesconfig : 72allyesconfig :
67 $(call descend,scripts/kconfig,conf) 73 $(call descend,scripts/kconfig,conf)
68 ./scripts/kconfig/conf -y ./config.in 74 ./scripts/kconfig/conf -y ./config.in
69 75
70allnoconfig : 76allnoconfig :
71 $(call descend,scripts/kconfig,conf) 77 $(call descend,scripts/kconfig,conf)
72 ./scripts/kconfig/conf -n ./config.in 78 ./scripts/kconfig/conf -n ./config.in
73 79
74defconfig : 80defconfig :
75 $(call descend,scripts/kconfig,conf) 81 $(call descend,scripts/kconfig,conf)
76 ./scripts/kconfig/conf -d ./config.in 82 ./scripts/kconfig/conf -d ./config.in
77 83
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
91$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 102$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
92 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 103 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
93 $(TOPDIR)/library/custom.h 104 $(TOPDIR)/library/custom.h
94 105
95clean : $(TOPDIR)/.config 106clean : $(TOPDIR)/.config
96 107
97include $(TOPDIR)/Rules.make 108include $(TOPDIR)/Rules.make
diff --git a/config.in.in b/config.in.in
index 41998d4..7af1f17 100644
--- a/config.in.in
+++ b/config.in.in
@@ -15,45 +15,48 @@ menu "Build Parameters"
15 15
16choice 16choice
17 prompt "Target Machine" 17 prompt "Target Machine"
18 default TARGET_X86 18 default TARGET_X86
19 help 19 help
20 Please select the architecture of the machine you will be 20 Please select the architecture of the machine you will be
21 building the OpenZaurus buildroot for. 21 building the OpenZaurus buildroot for.
22 22
23 config TARGET_X86 23 config TARGET_X86
24 boolean "Intel X86" 24 boolean "Intel X86"
25 25
26 config TARGET_SHARP 26 config TARGET_SHARP
27 boolean "Sharp Zaurus SL-5x00 - stock" 27 boolean "Sharp Zaurus SL-5x00 - stock"
28 28
29# config TARGET_OZ 29# config TARGET_OZ
30# boolean "Sharp Zaurus SL-5x00 - OpenZaurus" 30# boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
31 31
32 config TARGET_IPAQ 32 config TARGET_IPAQ
33 boolean "Ipaq" 33 boolean "Ipaq"
34 34
35endchoice 35endchoice
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
46 default "custom-ipaq.h" if TARGET_IPAQ 49 default "custom-ipaq.h" if TARGET_IPAQ
47 default "custom-sharp.h" if TARGET_SHARP 50 default "custom-sharp.h" if TARGET_SHARP
48 51
49#config CROSS 52#config CROSS
50# string "Crosscompilation prefix" 53# string "Crosscompilation prefix"
51# default "arm-linux-" 54# default "arm-linux-"
52# help 55# help
53# Crosscompilation prefix is the prefix which will be prepended 56# Crosscompilation prefix is the prefix which will be prepended
54# to all compilation commands. For example, a crosscompilation prefix 57# to all compilation commands. For example, a crosscompilation prefix
55# of arm-linux-, results in the build calling arm-linux-gcc as its CC. 58# of arm-linux-, results in the build calling arm-linux-gcc as its CC.
56 59
57endmenu 60endmenu
58 61
59@sources@ 62@sources@