author | kergoth <kergoth> | 2003-01-24 01:10:03 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-24 01:10:03 (UTC) |
commit | 06efe50042e7a6706e0c27e03c2e9e369ba32c70 (patch) (unidiff) | |
tree | 567a65aac29bba649492f6d1c7868494f12ee29f | |
parent | fdf29b4b01231c746f7697365fcd7bd57d154365 (diff) | |
download | opie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.zip opie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.tar.gz opie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.tar.bz2 |
Alter the lupdate and lrelease toplevel runs to not fail out on individual failures.
-rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,113 +1,116 @@ | |||
1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
2 | export OPIEDIR:=$(shell pwd) | 2 | export OPIEDIR:=$(shell pwd) |
3 | export TOPDIR:=$(OPIEDIR) | 3 | export TOPDIR:=$(OPIEDIR) |
4 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 4 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
5 | 5 | ||
6 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 6 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
7 | 7 | ||
8 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ | 8 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
9 | defconfig allyesconfig allnoconfig allmodconfig \ | 9 | defconfig allyesconfig allnoconfig allmodconfig \ |
10 | clean-configs | 10 | clean-configs |
11 | 11 | ||
12 | configs += $(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)/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/todayplugins/config.in | 12 | configs += $(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)/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/todayplugins/config.in |
13 | 13 | ||
14 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) | 14 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
15 | # in order to have a full set of config.in files. | 15 | # in order to have a full set of config.in files. |
16 | # .depends depends on $(TOPDIR)/.config | 16 | # .depends depends on $(TOPDIR)/.config |
17 | # everything else depends on .depends, to ensure the dependencies are | 17 | # everything else depends on .depends, to ensure the dependencies are |
18 | # intact. | 18 | # intact. |
19 | # | 19 | # |
20 | # NOTE: The order in which things happen in this makefile is | 20 | # NOTE: The order in which things happen in this makefile is |
21 | # -critical-. Do not rearrange this! | 21 | # -critical-. Do not rearrange this! |
22 | 22 | ||
23 | all : $(TOPDIR)/.config | 23 | all : $(TOPDIR)/.config |
24 | 24 | ||
25 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 25 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
26 | 26 | ||
27 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs | 27 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
28 | 28 | ||
29 | clean-configs : | 29 | clean-configs : |
30 | @echo "Wiping generated config.in files..." | 30 | @echo "Wiping generated config.in files..." |
31 | @-rm -f $(configs) | 31 | @-rm -f $(configs) |
32 | 32 | ||
33 | -include $(TOPDIR)/.depends.cfgs | 33 | -include $(TOPDIR)/.depends.cfgs |
34 | 34 | ||
35 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 35 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
36 | 36 | ||
37 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | 37 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
38 | $(call descend,scripts/kconfig,conf) | 38 | $(call descend,scripts/kconfig,conf) |
39 | @if [ ! -e $@ ]; then \ | 39 | @if [ ! -e $@ ]; then \ |
40 | cp $(TOPDIR)/def-configs/opie $@; \ | 40 | cp $(TOPDIR)/def-configs/opie $@; \ |
41 | fi; | 41 | fi; |
42 | @$(MAKE) -C scripts/kconfig conf; | 42 | @$(MAKE) -C scripts/kconfig conf; |
43 | ./scripts/kconfig/conf -s ./config.in | 43 | ./scripts/kconfig/conf -s ./config.in |
44 | 44 | ||
45 | # config rules must have the $(configs) var defined | 45 | # config rules must have the $(configs) var defined |
46 | # at the time that they run. we must ensure that .depends.cfgs | 46 | # at the time that they run. we must ensure that .depends.cfgs |
47 | # is built and included by the time we reach this point. | 47 | # is built and included by the time we reach this point. |
48 | 48 | ||
49 | xconfig : | 49 | xconfig : |
50 | $(call descend,scripts/kconfig,qconf) | 50 | $(call descend,scripts/kconfig,qconf) |
51 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ | 51 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ |
52 | ./scripts/kconfig/qconf ./config.in | 52 | ./scripts/kconfig/qconf ./config.in |
53 | 53 | ||
54 | menuconfig : scripts/lxdialog/lxdialog | 54 | menuconfig : scripts/lxdialog/lxdialog |
55 | $(call descend,scripts/kconfig,mconf) | 55 | $(call descend,scripts/kconfig,mconf) |
56 | ./scripts/kconfig/mconf ./config.in | 56 | ./scripts/kconfig/mconf ./config.in |
57 | 57 | ||
58 | config : | 58 | config : |
59 | $(call descend,scripts/kconfig,conf) | 59 | $(call descend,scripts/kconfig,conf) |
60 | ./scripts/kconfig/conf ./config.in | 60 | ./scripts/kconfig/conf ./config.in |
61 | 61 | ||
62 | oldconfig : | 62 | oldconfig : |
63 | $(call descend,scripts/kconfig,conf) | 63 | $(call descend,scripts/kconfig,conf) |
64 | ./scripts/kconfig/conf -o ./config.in | 64 | ./scripts/kconfig/conf -o ./config.in |
65 | 65 | ||
66 | randconfig : | 66 | randconfig : |
67 | $(call descend,scripts/kconfig,conf) | 67 | $(call descend,scripts/kconfig,conf) |
68 | ./scripts/kconfig/conf -r ./config.in | 68 | ./scripts/kconfig/conf -r ./config.in |
69 | 69 | ||
70 | allyesconfig : | 70 | allyesconfig : |
71 | $(call descend,scripts/kconfig,conf) | 71 | $(call descend,scripts/kconfig,conf) |
72 | ./scripts/kconfig/conf -y ./config.in | 72 | ./scripts/kconfig/conf -y ./config.in |
73 | 73 | ||
74 | allnoconfig : | 74 | allnoconfig : |
75 | $(call descend,scripts/kconfig,conf) | 75 | $(call descend,scripts/kconfig,conf) |
76 | ./scripts/kconfig/conf -n ./config.in | 76 | ./scripts/kconfig/conf -n ./config.in |
77 | 77 | ||
78 | defconfig : | 78 | defconfig : |
79 | $(call descend,scripts/kconfig,conf) | 79 | $(call descend,scripts/kconfig,conf) |
80 | ./scripts/kconfig/conf -d ./config.in | 80 | ./scripts/kconfig/conf -d ./config.in |
81 | 81 | ||
82 | 82 | ||
83 | export | 83 | export |
84 | 84 | ||
85 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | 85 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
86 | 86 | ||
87 | export include-config := 1 | 87 | export include-config := 1 |
88 | 88 | ||
89 | -include $(TOPDIR)/.config | 89 | -include $(TOPDIR)/.config |
90 | -include $(TOPDIR)/.depends | 90 | -include $(TOPDIR)/.depends |
91 | 91 | ||
92 | endif | 92 | endif |
93 | 93 | ||
94 | -include $(TOPDIR)/.config.cmd | 94 | -include $(TOPDIR)/.config.cmd |
95 | 95 | ||
96 | SUBDIRS = $(subdir-y) | 96 | SUBDIRS = $(subdir-y) |
97 | 97 | ||
98 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 98 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
99 | 99 | ||
100 | ifdef CONFIG_OPTIMIZATIONS | 100 | ifdef CONFIG_OPTIMIZATIONS |
101 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | 101 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
102 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | 102 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
103 | endif | 103 | endif |
104 | 104 | ||
105 | all clean lupdate lrelease install ipk: $(SUBDIRS) | 105 | all clean install ipk: $(SUBDIRS) |
106 | |||
107 | lupdate lrelease: | ||
108 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; | ||
106 | 109 | ||
107 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ | 110 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |
108 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ | 111 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ |
109 | $(TOPDIR)/library/custom.h | 112 | $(TOPDIR)/library/custom.h |
110 | 113 | ||
111 | clean : $(TOPDIR)/.config | 114 | clean : $(TOPDIR)/.config |
112 | 115 | ||
113 | include $(TOPDIR)/Rules.make | 116 | include $(TOPDIR)/Rules.make |