Fixes for Cygwin.

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b727d9ea8b99368749342905223fcf05c2c564b5..aa3aa1d74f7df626379ec2cdfe23c3be9d13bbca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,13 +75,13 @@ libmLib_la_LIBADD = @DEPLIBS@
 
 BUILT_SOURCES = crc32-tab.c unihash-global.c
 
-crc32-tab.c: crc-mktab
+crc32-tab.c: crc-mktab$(EXEEXT)
        ./crc-mktab \
                -p0x04c11db7 -b32 -B8 -r \
                -c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c.new
        mv crc32-tab.c.new crc32-tab.c
 
-unihash-global.c: unihash-mkstatic
+unihash-global.c: unihash-mkstatic$(EXEEXT)
        ./unihash-mkstatic \
                -c -sunihash_global -iunihash.h -ounihash-global.c.new
        mv unihash-global.c.new unihash-global.c
@@ -89,9 +89,11 @@ unihash-global.c: unihash-mkstatic
 crc_mktab_SOURCES = \
        crc-mktab.c \
        mdwopt.c quis.c pquis.c report.c str.c
+crc_mktab_CFLAGS = $(AM_CFLAGS)
 unihash_mkstatic_SOURCES = \
        unihash-mkstatic.c \
        mdwopt.c quis.c pquis.c report.c str.c unihash.c
+unihash_mkstatic_CFLAGS = $(AM_CFLAGS)
 
 ## --- Test code ---
 
@@ -193,9 +195,9 @@ unihash.t: unihash.to libmLib.la
                unihash.to .libs/libmLib.a $(LIBS) -o unihash.t
 unihash.in: unihash-check.pl
        perl $(srcdir)/unihash-check.pl >unihash.in.new
-       mv unihash.in.new unihash.in
+       mv unihash.in.new $(srcdir)/unihash.in
 unihash.test: unihash.t unihash.in
-       ./unihash.t -f unihash.in
+       ./unihash.t -f $(srcdir)/unihash.in
 
 TEST_CLEAN = \
        *.t *.to \
@@ -207,6 +209,7 @@ TEST_DIST = \
        da-gtest da-ref \
        sym-gtest sym-ref \
        bits.in bits-testgen.c \
+       unihash-check.pl unihash.in \
        base64.in base64.ref base32.in base32.ref hex.in hex.ref
 
 ## --- Background resolver ---
@@ -214,11 +217,8 @@ TEST_DIST = \
 ## I must (a) build the standalone version, and (b) inform the client library
 ## where the standalone version is.
 
-bres$(EXEEXT): bres-stnd.o
-       $(LINK) -o bres bres-stnd.o $(LIBS)
-
-bres-stnd.o: $(srcdir)/bres.c
-       $(COMPILE) -c -DBRES_STANDALONE -o bres-stnd.o $(srcdir)/bres.c
+bres_SOURCES = bres.c
+bres_CFLAGS = -DBRES_STANDALONE
 
 bres.lo: $(srcdir)/bres.c
        $(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/$(PACKAGE)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c