diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-12 00:36:44 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-12 00:36:44 +0200 |
| commit | 742f57054fe787714c9ab59aa704cdcec25f3b28 (patch) | |
| tree | 220a9ada7924be10490797a6727086b8519dd4cf /buildlib | |
| parent | 606837654922b8c58c9ac8a12b44c30f308115e3 (diff) | |
| download | apt-742f57054fe787714c9ab59aa704cdcec25f3b28.tar.gz | |
* Makefile, buildlib/*.mak:
- reshuffle dependencies so that parallel building seems to work
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/configure.mak | 11 | ||||
| -rw-r--r-- | buildlib/copy.mak | 2 | ||||
| -rw-r--r-- | buildlib/podomain.mak | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 310c2600c..c0d8e3c76 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub buildlib/config.guess: - ln -sf /usr/share/misc/config.guess buildlib/config.guess + ln -sf /usr/share/misc/config.guess buildlib/config.guess configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib - + $(BUILDDIR)/config.status: configure - /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) + /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) - -$(addprefix $(BUILDDIR)/,$(CONVERTED)): - (cd $(BUILDDIR) && ./config.status) + +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 3ae11a7eb..e8fe43deb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % +$($(LOCAL)-LIST) : $(TO)/% : % dirs echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index bb1c77e47..d46652520 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN) endif 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) > $@ +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE)) +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs + (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@ startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) |