summaryrefslogtreecommitdiff
path: root/procps/Makefile.in
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /procps/Makefile.in
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
- revert back to r14406
Diffstat (limited to 'procps/Makefile.in')
-rw-r--r--procps/Makefile.in20
1 files changed, 13 insertions, 7 deletions
diff --git a/procps/Makefile.in b/procps/Makefile.in
index 69455eb..261c49b 100644
--- a/procps/Makefile.in
+++ b/procps/Makefile.in
@@ -4,9 +4,13 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/procps
-objdir:=$(top_builddir)/procps
+PROCPS_AR:=procps.a
+ifndef $(PROCPS_DIR)
+PROCPS_DIR:=$(top_builddir)/procps/
+endif
+srcdir=$(top_srcdir)/procps
+PROCPS-y:=
PROCPS-$(CONFIG_FREE) += free.o
PROCPS-$(CONFIG_KILL) += kill.o
PROCPS-$(CONFIG_PIDOF) += pidof.o
@@ -17,15 +21,17 @@ PROCPS-$(CONFIG_TOP) += top.o
PROCPS-$(CONFIG_UPTIME) += uptime.o
PROCPS-$(CONFIG_FUSER) += fuser.o
+ifneq ($(strip $(PROCPS-y)),)
+libraries-y+=$(PROCPS_DIR)$(PROCPS_AR)
+endif
PROCPS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(PROCPS-y))
PROCPS_SRC-a:=$(wildcard $(srcdir)/*.c)
APPLET_SRC-y+=$(PROCPS_SRC-y)
APPLET_SRC-a+=$(PROCPS_SRC-a)
-procps_OBJ:= $(patsubst %,$(objdir)/%,$(PROCPS-y))
-
-$(procps_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/procps.a: $(procps_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/procps.a
+$(PROCPS_DIR)$(PROCPS_AR): $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y))
+ $(do_ar)
+$(PROCPS_DIR)%.o: $(srcdir)/%.c
+ $(compile.c)