X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/3ac6fc5f908dde89522ba92946a0cb85aabd4bc1..b64eb60f6c1fdb12f3922e04913e137199838807:/hash/Makefile.am

diff --git a/hash/Makefile.am b/hash/Makefile.am
index 938b605..564be16 100644
--- a/hash/Makefile.am
+++ b/hash/Makefile.am
@@ -28,6 +28,7 @@ include $(top_srcdir)/vars.am
 
 noinst_LTLIBRARIES	 = libhash.la
 libhash_la_SOURCES	 =
+nodist_libhash_la_SOURCES =
 libhash_la_LIBADD	 =
 
 ###--------------------------------------------------------------------------
@@ -43,24 +44,18 @@ crc_mktab_SOURCES	 = crc-mktab.c
 crc_mktab_LDADD		 = $(UTIL_LIBS)
 PROGMANS		+= crc-mktab.1
 
-libhash_la_SOURCES	+= $(precomp)/crc32-tab.c
+nodist_libhash_la_SOURCES += ../precomp/crc32-tab.c
 PRECOMPS		+= $(precomp)/crc32-tab.c
 if !CROSS_COMPILING
 $(precomp)/crc32-tab.c:
 	@$(mkdir_p) $(precomp)
-	@$(build_util_libs)
 	@$(MAKE) crc-mktab$(EXEEXT)
 	$(AM_V_GEN)./crc-mktab -o $@.new \
-		-p0x04c11db7 -b32 -B8 -r -c \
+		-p0x04c11db7 -b32 -B8 -r -cC \
 		-scrc32_table -icrc32.h -tuint32 && \
 	mv $@.new $@
 endif
 
-check_PROGRAMS		+= t/crc32.t
-t_crc32_t_SOURCES	 = t/crc32-test.c
-t_crc32_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
-t_crc32_t_LDFLAGS	 = -static
-
 EXTRA_DIST		+= t/crc32.tests
 
 ## Universal hashing.
@@ -75,22 +70,22 @@ unihash_mkstatic_SOURCES = unihash-mkstatic.c
 unihash_mkstatic_LDADD	 = libunihash.la $(UTIL_LIBS)
 PROGMANS		+= unihash-mkstatic.1
 
-libhash_la_SOURCES	+= $(precomp)/unihash-global.c
+nodist_libhash_la_SOURCES += ../precomp/unihash-global.c
 PRECOMPS		+= $(precomp)/unihash-global.c
 if !CROSS_COMPILING
 $(precomp)/unihash-global.c:
 	@$(mkdir_p) $(precomp)
-	@$(build_util_libs)
 	@$(MAKE) unihash-mkstatic$(EXEEXT)
 	$(AM_V_GEN)./unihash-mkstatic -c -sunihash_global -iunihash.h \
 		-o$@.new && mv $@.new $@
 endif
 
-check_PROGRAMS		+= t/unihash.t
-t_unihash_t_SOURCES	 = t/unihash-test.c
-t_unihash_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
-t_unihash_t_LDFLAGS	 = -static
-
 EXTRA_DIST		+= t/unihash-testgen.py
 
+## Test program.
+check_PROGRAMS		+= t/hash.t
+t_hash_t_SOURCES	 = t/hash-test.c
+t_hash_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
+t_hash_t_LDFLAGS	 = -static
+
 ###----- That's all, folks --------------------------------------------------