Commit ccba38ec authored by Niels Möller's avatar Niels Möller

Fixed make rules for building objects in parent directory.

parent dd15938e
2013-01-02 Niels Möller <nisse@lysator.liu.se>
* examples/Makefile.in: Explicit rules for building objects in
parent directory.
* tools/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
2013-01-01 Niels Möller <nisse@lysator.liu.se>
* nettle.texinfo (Recommended hash functions): Document additional
......
......@@ -39,8 +39,14 @@ all: $(TARGETS)
.c.$(OBJEXT):
$(COMPILE) -c $< && $(DEP_PROCESS)
$(getopt_OBJS) ../nettle-internal.$(OBJEXT):
( cd .. && $(MAKE) $@ )
# NOTE: If we required GNU make, we could use a single rule with $(@F)
# or $(notdir $@)
../getopt.$(OBJEXT):
( cd .. && $(MAKE) getopt.$(OBJEXT))
../getopt1.$(OBJEXT):
( cd .. && $(MAKE) getopt1.$(OBJEXT))
../nettle-internal.$(OBJEXT):
( cd .. && $(MAKE) nettle-internal.$(OBJEXT))
# For Solaris and BSD make, we have to use an explicit rule for each executable
next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
......
......@@ -75,7 +75,7 @@ TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
$(LIB_HOGWEED) -lnettle $(LIBS)
../nettle-internal.$(OBJEXT):
( cd .. && $(MAKE) $@ )
( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
.PHONY: test-rules
test-rules:
......
......@@ -53,8 +53,12 @@ nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
.c.$(OBJEXT):
$(COMPILE) -c $< && $(DEP_PROCESS)
$(getopt_OBJS):
( cd .. && $(MAKE) $@ )
# NOTE: If we required GNU make, we could use a single rule with $(@F)
# or $(notdir $@)
../getopt.$(OBJEXT):
( cd .. && $(MAKE) getopt.$(OBJEXT))
../getopt1.$(OBJEXT):
( cd .. && $(MAKE) getopt1.$(OBJEXT))
Makefile: $(srcdir)/Makefile.in ../config.status
cd .. && $(SHELL) ./config.status tools/$@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment