diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-06-26 06:30:09 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-06-26 06:30:09 +0200 |
| commit | a23dcda4a75ead3ef9712d90300f45155856b6ce (patch) | |
| tree | 8951be2e20b5403c4339fa246b59d7770c8e2e46 /buildlib | |
| parent | bc03039d0f532b6463de33bff60c7d876af6ea5e (diff) | |
| parent | b90d7d855709c49a6d5faff0ac65b96fd15e4500 (diff) | |
* merged with mainline
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/defaults.mak | 17 | ||||
| -rw-r--r-- | buildlib/podomain.mak | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c3d08d9d4..a171522d5 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1) PARALLEL_RUN=no endif -ifndef PARALLEL_RUN - PARALLEL_RUN=yes - .EXPORT: PARALLEL_RUN - # handle recursion - ifneq ($(NUM_PROCS),) - MAKEFLAGS += -j $(NUM_PROCS) - endif -endif +# mvo: commented out, lead to build failures in the arch-build target +#ifndef PARALLEL_RUN +# PARALLEL_RUN=yes +# .EXPORT: PARALLEL_RUN +# # handle recursion +# ifneq ($(NUM_PROCS),) +# MAKEFLAGS += -j $(NUM_PROCS) +# endif +#endif diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index e1ae0c805..511a5cae2 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile (echo $(SRC) | xargs -n1 echo) > $@ -binary program: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list +binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list |