summaryrefslogtreecommitdiffhomepage
path: root/sysklogd
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /sysklogd
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
- revert back to r14406
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/Makefile.in20
1 files changed, 13 insertions, 7 deletions
diff --git a/sysklogd/Makefile.in b/sysklogd/Makefile.in
index 412cf5bab..83f77be90 100644
--- a/sysklogd/Makefile.in
+++ b/sysklogd/Makefile.in
@@ -4,23 +4,29 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/sysklogd
-objdir:=$(top_builddir)/sysklogd
+SYSKLOGD_AR:=sysklogd.a
+ifndef $(SYSKLOGD_DIR)
+SYSKLOGD_DIR:=$(top_builddir)/sysklogd/
+endif
+srcdir=$(top_srcdir)/sysklogd
+SYSKLOGD-y:=
SYSKLOGD-$(CONFIG_KLOGD) += klogd.o
SYSKLOGD-$(CONFIG_LOGGER) += logger.o
SYSKLOGD-$(CONFIG_LOGREAD) += logread.o
SYSKLOGD-$(CONFIG_SYSLOGD) += syslogd.o
+ifneq ($(strip $(SYSKLOGD-y)),)
+libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR)
+endif
SYSKLOGD_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SYSKLOGD-y))
SYSKLOGD_SRC-a:=$(wildcard $(srcdir)/*.c)
APPLET_SRC-y+=$(SYSKLOGD_SRC-y)
APPLET_SRC-a+=$(SYSKLOGD_SRC-a)
-sysklogd_OBJ:= $(patsubst %,$(objdir)/%,$(SYSKLOGD-y))
-
-$(sysklogd_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/sysklogd.a: $(sysklogd_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/sysklogd.a
+$(SYSKLOGD_DIR)$(SYSKLOGD_AR): $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
+ $(do_ar)
+$(SYSKLOGD_DIR)%.o: $(srcdir)/%.c
+ $(compile.c)