Commit 987e6dc0 authored by Niels Möller's avatar Niels Möller
Browse files

* configure.ac: Replaced AC_OUTPUT(list...) with an AC_OUTPUT

without arguments, and AC_CONFIG_FILES listing the files.

* Makefile.in: Changed the assembler rules as suffix rules.
Rewrote the configure-related rules, mostly based on the example
in the autoconf manual.

Rev: src/nettle/ChangeLog:1.286
Rev: src/nettle/Makefile.in:1.5
Rev: src/nettle/configure.ac:1.46
parent 4094a0c3
2004-10-21 Niels Mller <niels@s3.kth.se>
* examples/Makefile.in: Deleted all configure-related rules,
except the one rebuilding this Makefile. Run make at top level if
other configure related files change.
* tools/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
* configure.ac: Replaced AC_OUTPUT(list...) with an AC_OUTPUT
without arguments, and AC_CONFIG_FILES listing the files.
* Makefile.in: Changed the assembler rules as suffix rules.
Rewrote the configure-related rules, mostly based on the example
in the autoconf manual.
2004-10-20 Niels Mller <nisse@lysator.liu.se> 2004-10-20 Niels Mller <nisse@lysator.liu.se>
* examples/nettle-openssl.c (NCOMPAT): Disable openssl backwards * examples/nettle-openssl.c (NCOMPAT): Disable openssl backwards
......
...@@ -96,7 +96,8 @@ INSTALL_HEADERS = $(HEADERS) nettle-types.h ...@@ -96,7 +96,8 @@ INSTALL_HEADERS = $(HEADERS) nettle-types.h
SOURCES = $(nettle_SOURCES) aesdata.c desdata.c shadata.c SOURCES = $(nettle_SOURCES) aesdata.c desdata.c shadata.c
DISTFILES = $(SOURCES) $(HEADERS) .bootstrap aclocal.m4 configure.ac configure \ DISTFILES = $(SOURCES) $(HEADERS) .bootstrap aclocal.m4 configure.ac \
configure stamp-h.in \
config.guess config.sub install-sh texinfo.tex \ config.guess config.sub install-sh texinfo.tex \
config.h.in config.m4.in config.make.in Makefile.in \ config.h.in config.m4.in config.make.in Makefile.in \
README AUTHORS COPYING INSTALL NEWS TODO ChangeLog \ README AUTHORS COPYING INSTALL NEWS TODO ChangeLog \
...@@ -158,24 +159,17 @@ $(des_headers): desdata.c ...@@ -158,24 +159,17 @@ $(des_headers): desdata.c
des.o: des.c des.h $(des_headers) des.o: des.c des.h $(des_headers)
# FIXME: For some reason, this rule breaks builds on Tru64 5.1B (on .asm.$(OBJEXT):
# alpha), with the system make. It fails with "Don't know how to make $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
# aes.asm", which is very strange, since the make program on this $< >$*.s
# system is not supposed to know about %-style pattern rules, and $(COMPILE) $(CCPIC_MAYBE) -c $*.s
# "aes.asm" doesn't occur explicitly in any target or dependency. echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
@IF_ENABLE_ASM@%.$(OBJEXT): %.asm asm.m4 machine.m4 config.m4 .asm.p$(OBJEXT):
@IF_ENABLE_ASM@ $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \ $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
@IF_ENABLE_ASM@ $< >$*.s $< >$*.s
@IF_ENABLE_ASM@ $(CC) $(CFLAGS) $(CCPIC_MAYBE) -c $*.s -o $@ $(COMPILE) $(SHLIBCFLAGS) -c $*.s -o $@
@IF_ENABLE_ASM@ echo >$*.d echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
# All assembler files should use pic-code only.
@IF_ENABLE_ASM@%.p$(OBJEXT): %.asm asm.m4 machine.m4 config.m4
@IF_ENABLE_ASM@ $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
@IF_ENABLE_ASM@ $< >$*.s
@IF_ENABLE_ASM@ $(CC) $(CFLAGS) $(CCPIC) -c $*.s -o $@
@IF_ENABLE_ASM@ echo >$*.d
# Texinfo rules # Texinfo rules
.texinfo.info: .texinfo.info:
...@@ -183,40 +177,35 @@ des.o: des.c des.h $(des_headers) ...@@ -183,40 +177,35 @@ des.o: des.c des.h $(des_headers)
&& test -s $@T && mv -f $@T $@ && test -s $@T && mv -f $@T $@
.texinfo.html: .texinfo.html:
cd $(srcdir) && $(MAKEINFO) --html --no-split --output $@T `basename $<` \ cd $(srcdir) && $(MAKEINFO) --html --no-split \
&& test -s $@T && mv -f $@T $@ --output $@T `basename $<` \
&& test -s $@T && mv -f $@T $@
# Configure-related rules
.PRECIOUS: Makefile # Configure-related rules, mostly copied from the autoconf manual. No
Makefile: $(srcdir)/Makefile.in config.status # $(srcdir) prefixes on the targets, though.
$(SHELL) ./config.status $@
config.make: $(srcdir)/config.make.in config.status configure: configure.ac aclocal.m4
$(SHELL) ./config.status $@ cd $(srcdir) && $(AUTOCONF)
config.status: $(srcdir)/configure # autoheader might not change config.h.in, so touch a stamp file.
$(SHELL) ./config.status --recheck config.h.in: stamp-h.in
stamp-h.in: configure.ac aclocal.m4
cd $(srcdir) && autoheader
echo timestamp > $(srcdir)/stamp-h.in
config.m4: config.status $(srcdir)/config.m4.in config.status: configure
$(SHELL) ./config.status $@ ./config.status --recheck
configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 config.h: stamp-h
cd $(srcdir) && $(AUTOCONF) stamp-h: config.h.in config.status
./config.status config.h
echo timestamp > stamp-h
config.h: stamp-h1 Makefile: Makefile.in config.status
@if test ! -f $@; then \ ./config.status $@
rm -f stamp-h1; \
$(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in config.status config.make: config.make.in config.status
@rm -f stamp-h1 ./config.status $@
$(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(srcdir)/configure.ac
cd $(srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
# Installation # Installation
install-here: install-info install-headers libnettle.a $(SHLIBINSTALL) install-here: install-info install-headers libnettle.a $(SHLIBINSTALL)
...@@ -331,7 +320,7 @@ clean-here: ...@@ -331,7 +320,7 @@ clean-here:
-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.d -rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.d
distclean-here: clean-here distclean-here: clean-here
-rm -f config.h stamp-h1 config.log config.status \ -rm -f config.h stamp-h config.log config.status \
config.make config.m4 Makefile nettle-types.h config.make config.m4 Makefile nettle-types.h
-include $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d) -include $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d)
...@@ -240,5 +240,8 @@ if test x$GCC = xyes ; then ...@@ -240,5 +240,8 @@ if test x$GCC = xyes ; then
# inttypes.h. # inttypes.h.
fi fi
AC_OUTPUT(Makefile config.make config.m4 tools/Makefile testsuite/Makefile examples/Makefile) AC_CONFIG_FILES([config.make config.m4 Makefile])
AC_CONFIG_FILES([tools/Makefile testsuite/Makefile examples/Makefile])
AC_OUTPUT
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