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 /debianutils | |
| parent | c5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff) | |
- revert back to r14406
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/Makefile.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/debianutils/Makefile.in b/debianutils/Makefile.in index 4f72c233c..2983565b8 100644 --- a/debianutils/Makefile.in +++ b/debianutils/Makefile.in @@ -4,9 +4,13 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -srcdir:=$(top_srcdir)/debianutils -objdir:=$(top_builddir)/debianutils +DEBIANUTILS_AR:=debianutils.a +ifndef $(DEBIANUTILS_DIR) +DEBIANUTILS_DIR:=$(top_builddir)/debianutils/ +endif +srcdir=$(top_srcdir)/debianutils +DEBIANUTILS-y:= DEBIANUTILS-$(CONFIG_MKTEMP) += mktemp.o DEBIANUTILS-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o DEBIANUTILS-$(CONFIG_READLINK) += readlink.o @@ -14,14 +18,16 @@ DEBIANUTILS-$(CONFIG_RUN_PARTS) += run_parts.o DEBIANUTILS-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o DEBIANUTILS-$(CONFIG_WHICH) += which.o +ifneq ($(strip $(DEBIANUTILS-y)),) +libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR) +endif DEBIANUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(DEBIANUTILS-y)) DEBIANUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(DEBIANUTILS_SRC-y) APPLET_SRC-a+=$(DEBIANUTILS_SRC-a) -debianutils_OBJ:= $(patsubst %,$(objdir)/%,$(DEBIANUTILS-y)) - -$(debianutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c -$(objdir)/debianutils.a: $(debianutils_OBJ) -libraries-y:=$(libraries-y) $(objdir)/debianutils.a +$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y)) + $(do_ar) +$(DEBIANUTILS_DIR)%.o: $(srcdir)/%.c + $(compile.c) |