summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-24 01:10:03 (UTC)
committer kergoth <kergoth>2003-01-24 01:10:03 (UTC)
commit06efe50042e7a6706e0c27e03c2e9e369ba32c70 (patch) (unidiff)
tree567a65aac29bba649492f6d1c7868494f12ee29f
parentfdf29b4b01231c746f7697365fcd7bd57d154365 (diff)
downloadopie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.zip
opie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.tar.gz
opie-06efe50042e7a6706e0c27e03c2e9e369ba32c70.tar.bz2
Alter the lupdate and lrelease toplevel runs to not fail out on individual failures.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7646446..685d213 100644
--- a/Makefile
+++ b/Makefile
@@ -81,33 +81,36 @@ defconfig :
81 81
82 82
83export 83export
84 84
85ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 85ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
86 86
87export include-config := 1 87export include-config := 1
88 88
89-include $(TOPDIR)/.config 89-include $(TOPDIR)/.config
90-include $(TOPDIR)/.depends 90-include $(TOPDIR)/.depends
91 91
92endif 92endif
93 93
94-include $(TOPDIR)/.config.cmd 94-include $(TOPDIR)/.config.cmd
95 95
96SUBDIRS = $(subdir-y) 96SUBDIRS = $(subdir-y)
97 97
98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
99 99
100ifdef CONFIG_OPTIMIZATIONS 100ifdef CONFIG_OPTIMIZATIONS
101export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 101export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
102export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 102export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
103endif 103endif
104 104
105all clean lupdate lrelease install ipk: $(SUBDIRS) 105all clean install ipk: $(SUBDIRS)
106
107lupdate 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
111clean : $(TOPDIR)/.config 114clean : $(TOPDIR)/.config
112 115
113include $(TOPDIR)/Rules.make 116include $(TOPDIR)/Rules.make