From fd61c58320919ee8751a614941e59571792bc626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Thu, 2 Dec 2004 21:57:29 +0100 Subject: [PATCH] * Makefile.in (.SUFFIXES): Moved from Makefile.in to... * config.make.in (.SUFFIXES): ... here. This helps compilation with BSD make. * testsuite/Makefile.in (.SUFFIXES): Deleted target. Rev: src/nettle/ChangeLog:1.315 Rev: src/nettle/Makefile.in:1.19 Rev: src/nettle/config.make.in:1.7 Rev: src/nettle/testsuite/Makefile.in:1.12 --- ChangeLog | 5 +++++ Makefile.in | 9 --------- config.make.in | 9 ++++++--- testsuite/Makefile.in | 3 --- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37abc75a..87b25911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-12-02 Niels Möller <nisse@lysator.liu.se> + * Makefile.in (.SUFFIXES): Moved from Makefile.in to... + * config.make.in (.SUFFIXES): ... here. This helps compilation + with BSD make. + * testsuite/Makefile.in (.SUFFIXES): Deleted target. + * config.make.in (.c): Disable default rule for BSD-make. * Makefile.in (all check install uninstall) diff --git a/Makefile.in b/Makefile.in index 1f616450..f4383722 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,9 +35,6 @@ check-here: dvi installcheck uninstallcheck: true -.SUFFIXES: -.SUFFIXES: .asm .html .c .dvi .info .$(OBJEXT) .p$(OBJEXT) .exe .pdf .ps .texinfo - all-here: $(TARGETS) nettle_SOURCES = aes.c \ @@ -136,12 +133,6 @@ $(SHLIBFORLINK): $(nettle_PURE_OBJS) .$(OBJEXT)$(EXEEXT): $(LINK) $< $(LIBS) -o $@ -# aesdata$(EXEEXT): aesdata.$(OBJEXT) -# $(LINK) $< $(LIBS) -o $@ -# -# desdata$(EXEEXT): desdata.$(OBJEXT) -# $(LINK) $< $(LIBS) -o $@ - shadata$(EXEEXT): shadata.$(OBJEXT) $(LINK) shadata.$(OBJEXT) $(LIBS) -lm -o $@ diff --git a/config.make.in b/config.make.in index 537599b2..404389c1 100644 --- a/config.make.in +++ b/config.make.in @@ -64,13 +64,16 @@ LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) # usual targets. default: all +# For some reason the suffixes list must be set before the rules. +# Otherwise BSD make won't build binaries e.g. aesdata. + +.SUFFIXES: +.SUFFIXES: .asm .c .$(OBJEXT) .p$(OBJEXT) .html .dvi .info .exe .pdf .ps .texinfo + # Disable builtin rule %$(EXEEXT) : %.c .c: -# Keep object files -.PRECIOUS: %.o - .PHONY: all check install uninstall clean distclean mostlyclean maintainer-clean distdir \ all-here check-here install-here clean-here distclean-here mostlyclean-here \ maintainer-clean-here distdir-here \ diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 5a0fde45..b91939f3 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -35,9 +35,6 @@ DISTFILES = $(SOURCES) Makefile.in $(TS_SH) run-tests rfc1750.txt testutils.h all: $(TARGETS) -.SUFFIXES: -.SUFFIXES: .c .$(OBJEXT) .exe - .c.$(OBJEXT): $(COMPILE) -I.. -c $< && $(DEP_PROCESS) -- GitLab