From 5d26126b9e8fd6c6f5098dbaa2e5b9e2901749bf Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 1 Mar 2006 22:54:48 +0000 Subject: - fixes parallel builds (make -j) - use less resources for the buildsystem itself --- libpwdgrp/Makefile.in | 54 ++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) (limited to 'libpwdgrp') diff --git a/libpwdgrp/Makefile.in b/libpwdgrp/Makefile.in index c74a768c1..93c4634a2 100644 --- a/libpwdgrp/Makefile.in +++ b/libpwdgrp/Makefile.in @@ -4,35 +4,28 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -LIBPWDGRP_AR:=libpwdgrp.a -ifndef $(LIBPWDGRP_DIR) -LIBPWDGRP_DIR:=$(top_builddir)/libpwdgrp -endif srcdir=$(top_srcdir)/libpwdgrp - -LIBPWDGRP-obj:=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) -LIBPWDGRP-pic:=$(LIBPWDGRP_DIR)/$(subst .a,-pic.o,$(LIBPWDGRP_AR)) - -libraries-y+=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) -libraries-m+=$(LIBPWDGRP-multi-pic) +objdir=$(top_builddir)/libpwdgrp LIBPWDGRP_MSRC0:=$(srcdir)/pwd_grp.c -LIBPWDGRP_MOBJ0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r.o fgetgrent_r.o \ - fgetpwent.o fgetgrent.o getpwnam_r.o getgrnam_r.o getpwuid_r.o \ - getgrgid_r.o getpwuid.o getgrgid.o getpwnam.o getgrnam.o getpw.o \ - getpwent_r.o getgrent_r.o getpwent.o getgrent.o \ - initgroups.o putpwent.o putgrent.o -LIBPWDGRP_MOBJS0=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ0-y)) +LIBPWDGRP_M0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r fgetgrent_r \ + fgetpwent fgetgrent getpwnam_r getgrnam_r getpwuid_r \ + getgrgid_r getpwuid getgrgid getpwnam getgrnam getpw \ + getpwent_r getgrent_r getpwent getgrent \ + initgroups putpwent putgrent +LIBPWDGRP_MOBJ0=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M0-y)) +$(LIBPWDGRP_MOBJ0): $(LIBPWDGRP_MSRC0) LIBPWDGRP_MSRC1:=$(srcdir)/pwd_grp.c -LIBPWDGRP_MOBJ1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent.o __parsegrent.o \ - __pgsreader.o fgetspent_r.o fgetspent.o sgetspent_r.o getspnam_r.o \ - getspnam.o getspent_r.o getspent.o sgetspent.o \ - putspent.o __parsespent.o # getspuid_r.o getspuid.o -LIBPWDGRP_MOBJS1=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ1-y)) +LIBPWDGRP_M1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent __parsegrent \ + __pgsreader fgetspent_r fgetspent sgetspent_r getspnam_r \ + getspnam getspent_r getspent sgetspent \ + putspent __parsespent # getspuid_r getspuid +LIBPWDGRP_MOBJ1=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M1-y)) +$(LIBPWDGRP_MOBJ1): $(LIBPWDGRP_MSRC1) -LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS0)))) -LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS1)))) +LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M0-y)) +LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M1-y)) LIBPWDGRP_SRC-y:=$(LIBPWDGRP_MSRC0) @@ -42,12 +35,11 @@ LIBRARY_SRC-a+=$(LIBPWDGRP_SRC-y) LIBRARY_DEFINE-y+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) LIBRARY_DEFINE-a+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) +libpwdgrp_MOBJ$(os):=$(LIBPWDGRP_MOBJ0) $(LIBPWDGRP_MOBJ1) -$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1) - $(do_ar) - -$(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0) - $(compile.c) -DL_$(notdir $*) - -$(LIBPWDGRP_MOBJS1): $(LIBPWDGRP_MSRC1) - $(compile.c) -DL_$(notdir $*) +ifeq ($(om),.osm) +# XXX FIXME: +# also create a pattern for the non-shared case +$(LIBPWDGRP_MOBJ0:.osm=.om): $(LIBPWDGRP_MSRC0) +$(LIBPWDGRP_MOBJ1:.osm=.om): $(LIBPWDGRP_MSRC1) +endif -- cgit v1.2.3