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 /procps | |
| 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 'procps')
| -rw-r--r-- | procps/Makefile.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/procps/Makefile.in b/procps/Makefile.in index 69455eb26..261c49b02 100644 --- a/procps/Makefile.in +++ b/procps/Makefile.in | |||
| @@ -4,9 +4,13 @@ | |||
| 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)/procps | 7 | PROCPS_AR:=procps.a |
| 8 | objdir:=$(top_builddir)/procps | 8 | ifndef $(PROCPS_DIR) |
| 9 | PROCPS_DIR:=$(top_builddir)/procps/ | ||
| 10 | endif | ||
| 11 | srcdir=$(top_srcdir)/procps | ||
| 9 | 12 | ||
| 13 | PROCPS-y:= | ||
| 10 | PROCPS-$(CONFIG_FREE) += free.o | 14 | PROCPS-$(CONFIG_FREE) += free.o |
| 11 | PROCPS-$(CONFIG_KILL) += kill.o | 15 | PROCPS-$(CONFIG_KILL) += kill.o |
| 12 | PROCPS-$(CONFIG_PIDOF) += pidof.o | 16 | PROCPS-$(CONFIG_PIDOF) += pidof.o |
| @@ -17,15 +21,17 @@ PROCPS-$(CONFIG_TOP) += top.o | |||
| 17 | PROCPS-$(CONFIG_UPTIME) += uptime.o | 21 | PROCPS-$(CONFIG_UPTIME) += uptime.o |
| 18 | PROCPS-$(CONFIG_FUSER) += fuser.o | 22 | PROCPS-$(CONFIG_FUSER) += fuser.o |
| 19 | 23 | ||
| 24 | ifneq ($(strip $(PROCPS-y)),) | ||
| 25 | libraries-y+=$(PROCPS_DIR)$(PROCPS_AR) | ||
| 26 | endif | ||
| 20 | 27 | ||
| 21 | PROCPS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(PROCPS-y)) | 28 | PROCPS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(PROCPS-y)) |
| 22 | PROCPS_SRC-a:=$(wildcard $(srcdir)/*.c) | 29 | PROCPS_SRC-a:=$(wildcard $(srcdir)/*.c) |
| 23 | APPLET_SRC-y+=$(PROCPS_SRC-y) | 30 | APPLET_SRC-y+=$(PROCPS_SRC-y) |
| 24 | APPLET_SRC-a+=$(PROCPS_SRC-a) | 31 | APPLET_SRC-a+=$(PROCPS_SRC-a) |
| 25 | 32 | ||
| 26 | procps_OBJ:= $(patsubst %,$(objdir)/%,$(PROCPS-y)) | 33 | $(PROCPS_DIR)$(PROCPS_AR): $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y)) |
| 27 | 34 | $(do_ar) | |
| 28 | $(procps_OBJ): $(objdir)/%.o: $(srcdir)/%.c | ||
| 29 | $(objdir)/procps.a: $(procps_OBJ) | ||
| 30 | libraries-y:=$(libraries-y) $(objdir)/procps.a | ||
| 31 | 35 | ||
| 36 | $(PROCPS_DIR)%.o: $(srcdir)/%.c | ||
| 37 | $(compile.c) | ||