diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-13 19:04:00 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-13 19:04:00 +0000 |
| commit | df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch) | |
| tree | 49493696039b285aa751a5bc884fc70c9c85e878 /libpwdgrp | |
| parent | c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff) | |
| download | busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2 busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip | |
- revert back to r14406
Diffstat (limited to 'libpwdgrp')
| -rw-r--r-- | libpwdgrp/Makefile.in | 54 |
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 @@ | |||
| 4 | # | 4 | # |
| 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
| 6 | 6 | ||
| 7 | srcdir:=$(top_srcdir)/libpwdgrp | 7 | LIBPWDGRP_AR:=libpwdgrp.a |
| 8 | objdir:=$(top_builddir)/libpwdgrp | 8 | ifndef $(LIBPWDGRP_DIR) |
| 9 | LIBPWDGRP_DIR:=$(top_builddir)/libpwdgrp | ||
| 10 | endif | ||
| 11 | srcdir=$(top_srcdir)/libpwdgrp | ||
| 12 | |||
| 13 | LIBPWDGRP-obj:=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) | ||
| 14 | |||
| 15 | libraries-y+=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) | ||
| 9 | 16 | ||
| 10 | LIBPWDGRP_MSRC0:=$(srcdir)/pwd_grp.c | 17 | LIBPWDGRP_MSRC0:=$(srcdir)/pwd_grp.c |
| 11 | LIBPWDGRP_M0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r fgetgrent_r \ | 18 | LIBPWDGRP_MOBJ0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r.o fgetgrent_r.o \ |
| 12 | fgetpwent fgetgrent getpwnam_r getgrnam_r getpwuid_r \ | 19 | fgetpwent.o fgetgrent.o getpwnam_r.o getgrnam_r.o getpwuid_r.o \ |
| 13 | getgrgid_r getpwuid getgrgid getpwnam getgrnam getpw \ | 20 | getgrgid_r.o getpwuid.o getgrgid.o getpwnam.o getgrnam.o getpw.o \ |
| 14 | getpwent_r getgrent_r getpwent getgrent \ | 21 | getpwent_r.o getgrent_r.o getpwent.o getgrent.o \ |
| 15 | initgroups putpwent putgrent | 22 | initgroups.o putpwent.o putgrent.o |
| 16 | LIBPWDGRP_MOBJ0=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M0-y)) | 23 | LIBPWDGRP_MOBJS0=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ0-y)) |
| 17 | $(LIBPWDGRP_MOBJ0): $(LIBPWDGRP_MSRC0) | ||
| 18 | 24 | ||
| 19 | LIBPWDGRP_MSRC1:=$(srcdir)/pwd_grp.c | 25 | LIBPWDGRP_MSRC1:=$(srcdir)/pwd_grp.c |
| 20 | LIBPWDGRP_M1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent __parsegrent \ | 26 | LIBPWDGRP_MOBJ1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent.o __parsegrent.o \ |
| 21 | __pgsreader fgetspent_r fgetspent sgetspent_r getspnam_r \ | 27 | __pgsreader.o fgetspent_r.o fgetspent.o sgetspent_r.o getspnam_r.o \ |
| 22 | getspnam getspent_r getspent sgetspent \ | 28 | getspnam.o getspent_r.o getspent.o sgetspent.o \ |
| 23 | putspent __parsespent # getspuid_r getspuid | 29 | putspent.o __parsespent.o # getspuid_r.o getspuid.o |
| 24 | LIBPWDGRP_MOBJ1=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M1-y)) | 30 | LIBPWDGRP_MOBJS1=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ1-y)) |
| 25 | $(LIBPWDGRP_MOBJ1): $(LIBPWDGRP_MSRC1) | ||
| 26 | 31 | ||
| 27 | LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M0-y)) | 32 | LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS0)))) |
| 28 | LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M1-y)) | 33 | LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS1)))) |
| 29 | 34 | ||
| 30 | LIBPWDGRP_SRC-y:=$(LIBPWDGRP_MSRC0) | 35 | LIBPWDGRP_SRC-y:=$(LIBPWDGRP_MSRC0) |
| 31 | 36 | ||
| @@ -35,15 +40,12 @@ LIBRARY_SRC-a+=$(LIBPWDGRP_SRC-y) | |||
| 35 | LIBRARY_DEFINE-y+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) | 40 | LIBRARY_DEFINE-y+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) |
| 36 | LIBRARY_DEFINE-a+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) | 41 | LIBRARY_DEFINE-a+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) |
| 37 | 42 | ||
| 38 | libpwdgrp_MOBJ$(os):=$(LIBPWDGRP_MOBJ0) $(LIBPWDGRP_MOBJ1) | ||
| 39 | 43 | ||
| 40 | ifeq ($(om),.osm) | 44 | $(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1) |
| 41 | # XXX FIXME: | 45 | $(do_ar) |
| 42 | # also create a pattern for the non-shared case | ||
| 43 | $(LIBPWDGRP_MOBJ0:.osm=.om): $(LIBPWDGRP_MSRC0) | ||
| 44 | $(LIBPWDGRP_MOBJ1:.osm=.om): $(LIBPWDGRP_MSRC1) | ||
| 45 | endif | ||
| 46 | 46 | ||
| 47 | $(objdir)/libpwdgrp.a: $(libpwdgrp_MOBJ$(os)) | 47 | $(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0) |
| 48 | libraries-y:=$(libraries-y) $(objdir)/libpwdgrp.a | 48 | $(compile.c) -DL_$(notdir $*) |
| 49 | 49 | ||
| 50 | $(LIBPWDGRP_MOBJS1): $(LIBPWDGRP_MSRC1) | ||
| 51 | $(compile.c) -DL_$(notdir $*) | ||