aboutsummaryrefslogtreecommitdiff
path: root/libpwdgrp
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /libpwdgrp
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
- revert back to r14406
Diffstat (limited to 'libpwdgrp')
-rw-r--r--libpwdgrp/Makefile.in54
1 files changed, 28 insertions, 26 deletions
diff --git a/libpwdgrp/Makefile.in b/libpwdgrp/Makefile.in
index a99d3d86f..2511d34ef 100644
--- a/libpwdgrp/Makefile.in
+++ b/libpwdgrp/Makefile.in
@@ -4,28 +4,33 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/libpwdgrp
-objdir:=$(top_builddir)/libpwdgrp
+LIBPWDGRP_AR:=libpwdgrp.a
+ifndef $(LIBPWDGRP_DIR)
+LIBPWDGRP_DIR:=$(top_builddir)/libpwdgrp
+endif
+srcdir=$(top_srcdir)/libpwdgrp
+
+LIBPWDGRP-obj:=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR)
+
+libraries-y+=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR)
LIBPWDGRP_MSRC0:=$(srcdir)/pwd_grp.c
-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_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_MSRC1:=$(srcdir)/pwd_grp.c
-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_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_DEFINE0-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M0-y))
-LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M1-y))
+LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS0))))
+LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS1))))
LIBPWDGRP_SRC-y:=$(LIBPWDGRP_MSRC0)
@@ -35,15 +40,12 @@ 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)
-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
+$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1)
+ $(do_ar)
-$(objdir)/libpwdgrp.a: $(libpwdgrp_MOBJ$(os))
-libraries-y:=$(libraries-y) $(objdir)/libpwdgrp.a
+$(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0)
+ $(compile.c) -DL_$(notdir $*)
+$(LIBPWDGRP_MOBJS1): $(LIBPWDGRP_MSRC1)
+ $(compile.c) -DL_$(notdir $*)