summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1996-04-26 19:50:47 +0000
committerMichael I. Bushnell <mib@gnu.org>1996-04-26 19:50:47 +0000
commita6a9ba4bef0212b95d1de28b96e3b5c52c041a95 (patch)
treefce5c8ba459dbcfe43416e600cc1ab36a38c4cb5
parent9b8d25e64fe06aee6e14541caf78b7b8a4f9ccb1 (diff)
(OBJS): Provide default definition.
(_objs): Delete variable; replace references with $(OBJS).
-rw-r--r--Makeconf9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makeconf b/Makeconf
index 3c1d3270..6f57d335 100644
--- a/Makeconf
+++ b/Makeconf
@@ -152,11 +152,12 @@ endif
install:
# Building the target
+ifeq ($(OBJS),)
+OBJS=%.o
+endif
+
ifeq ($(doinst),many)
target = $(filter-out $(special-targets),$(targets))
- _objs = %.o
-else
- _objs = $(OBJS)
endif
# Determine which sort of library we should link against from whether -static
@@ -173,7 +174,7 @@ _libsubst=${libsubst$(patsubst %,-override,${libsubst-override})}
# dependencies of other shared objects it encounters.
rpath := -Wl,-rpath-link=.:$(subst $. ,:,$(dir $(wildcard ../lib*/lib*.so)))
-$(target): %$(target-suffix): $(_objs) $(OTHERLIBS)
+$(target): %$(target-suffix): $(OBJS) $(OTHERLIBS)
$(CC) $(rpath) $(CFLAGS) $($@-CFLAGS) $(LDFLAGS) $($@-LDFLAGS) -o $@ \
'-Wl,-(' $(filter %.o,$^) \
$(foreach lib,$(filter-out %.o,$+),${_libsubst}) \