build: Cope with the `subdir-objects' world Automake wants us to live in.

[mLib] / hash / Makefile.am

diff --git a/hash/Makefile.am b/hash/Makefile.am
index c6167a6..f20c251 100644 (file)
--- 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,19 +44,25 @@ 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)
-       ./crc-mktab -o $@.new \
+       @$(MAKE) crc-mktab$e
+       $(AM_V_GEN)./crc-mktab -o $@.new \
                -p0x04c11db7 -b32 -B8 -r -c \
                -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.
 pkginclude_HEADERS     += unihash.h
 noinst_LTLIBRARIES     += libunihash.la
@@ -68,29 +75,21 @@ 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)
-       ./unihash-mkstatic -c -sunihash_global -iunihash.h -o$@.new && \
-               mv $@.new $@
+       @$(MAKE) unihash-mkstatic$e
+       $(AM_V_GEN)./unihash-mkstatic -c -sunihash_global -iunihash.h \
+               -o$@.new && mv $@.new $@
 endif
 
-check_PROGRAMS         += unihash.t
-unihash_t_SOURCES       = unihash.c
-unihash_t_CPPFLAGS      = $(TEST_CPPFLAGS)
-unihash_t_LDFLAGS       = -static
-
-tests:: unihash.t unihash.in
-       ./unihash.t -f unihash.in
-
-EXTRA_DIST             += unihash-check.pl
-CLEANFILES             += unihash.in
-unihash.in: unihash-check.pl
-       perl $(srcdir)/unihash-check.pl >$@.new && mv $@.new $@
+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
 
 ###----- That's all, folks --------------------------------------------------