Skip to content
Snippets Groups Projects
Commit 0f46bfe9 authored by Niels Möller's avatar Niels Möller
Browse files

Fixed make dist, testsuite/testutils.c was lost.

parent c01af48b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
ChangeLog
+ 6
− 0
View file @ 0f46bfe9
2012-10-27 Niels Möller <nisse@lysator.liu.se> 2012-10-27 Niels Möller <nisse@lysator.liu.se>
* testsuite/Makefile.in (TS_SOURCES, CXX_SOURCES): Include sources
unconditionally.
(TS_CXX): Moved @IF_CXX@ conditional here.
(DISTFILES): Use $(SOURCES), which now includes all C source
files. testutils.c was lost in a the 2012-09-20 change.
* x86_64/salsa20-crypt.asm: Include x86_64/salsa20.m4. * x86_64/salsa20-crypt.asm: Include x86_64/salsa20.m4.
Make all exits go via .Lend and W64_EXIT. Make all exits go via .Lend and W64_EXIT.
......
testsuite/Makefile.in
+ 7
− 7
View file @ 0f46bfe9
...@@ -34,25 +34,23 @@ TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \ ...@@ -34,25 +34,23 @@ TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \ rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \
dsa-test.c dsa-keygen-test.c dsa-test.c dsa-keygen-test.c
TS_SOURCES = $(TS_NETTLE_SOURCES) @IF_HOGWEED@ $(TS_HOGWEED_SOURCES) TS_SOURCES = $(TS_NETTLE_SOURCES) $(TS_HOGWEED_SOURCES)
CXX_SOURCES = @IF_CXX@ cxx-test.cxx CXX_SOURCES = cxx-test.cxx
TS_NETTLE = $(TS_NETTLE_SOURCES:.c=$(EXEEXT)) TS_NETTLE = $(TS_NETTLE_SOURCES:.c=$(EXEEXT))
TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(EXEEXT)) TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(EXEEXT))
TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED) TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED)
TS_CXX = $(CXX_SOURCES:.cxx=$(EXEEXT)) TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
TARGETS = $(TS_C) $(TS_CXX) TARGETS = $(TS_C) $(TS_CXX)
TS_SH = sexp-conv-test pkcs1-conv-test symbols-test TS_SH = sexp-conv-test pkcs1-conv-test symbols-test
TS_ALL = $(TARGETS) $(TS_SH) TS_ALL = $(TARGETS) $(TS_SH)
EXTRA_SOURCES = sha1-huge-test.c EXTRA_SOURCES = sha1-huge-test.c
EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT)) EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
# C source files to be built # Includes all C source files, regardless of configuration
SOURCES = $(TS_SOURCES) $(EXTRA_SOURCES) testutils.c SOURCES = $(TS_SOURCES) $(EXTRA_SOURCES) testutils.c
# Includes all C source files, regardless of configuration DISTFILES = $(SOURCES) $(CXX_SOURCES) Makefile.in .test-rules.make \
DISTFILES = $(TS_NETTLE_SOURCES) $(TS_HOGWEED_SOURCES) \
$(EXTRA_SOURCES) cxx-test.cxx Makefile.in .test-rules.make \
$(TS_SH) setup-env teardown-env \ $(TS_SH) setup-env teardown-env \
gold-bug.txt testutils.h gold-bug.txt testutils.h
...@@ -127,5 +125,7 @@ distclean: clean ...@@ -127,5 +125,7 @@ distclean: clean
tags: tags:
etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
# Includes dependency files for everything, including objects which
# the current configuration will not build.
DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(CXX_SOURCES:.cxx=.$(OBJEXT).d) DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(CXX_SOURCES:.cxx=.$(OBJEXT).d)
@DEP_INCLUDE@ $(DEP_FILES) @DEP_INCLUDE@ $(DEP_FILES)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment