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) | |
- 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 @@ # # 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) |