chiark
/
gitweb
/
~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix maintainer email addr.
[mLib]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b727d9ea8b99368749342905223fcf05c2c564b5..4437953a0d61845bfa855d615c7cb0750d9fc9a5 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-43,7
+43,8
@@
pkglibexec_PROGRAMS = @BRES_LIBEXEC@
EXTRA_PROGRAMS = bres
pkginclude_HEADERS = \
EXTRA_PROGRAMS = bres
pkginclude_HEADERS = \
- align.h alloc.h arena.h bits.h exc.h macros.h quis.h report.h sub.h \
+ align.h alloc.h arena.h bits.h buf.h exc.h macros.h quis.h \
+ report.h sub.h \
trace.h track.h unihash.h \
pool.h \
atom.h assoc.h darray.h dstr.h dspool.h hash.h sym.h crc32.h \
trace.h track.h unihash.h \
pool.h \
atom.h assoc.h darray.h dstr.h dspool.h hash.h sym.h crc32.h \
@@
-59,10
+60,11
@@
libmLib_la_LDFLAGS = -version-info 2:3:0
## difference between the first and last numbers is major version.
libmLib_la_SOURCES = \
## difference between the first and last numbers is major version.
libmLib_la_SOURCES = \
- alloc.c arena.c exc.c quis.c pquis.c report.c sub.c trace.c \
+ alloc.c arena.c
buf.c
exc.c quis.c pquis.c report.c sub.c trace.c \
traceopt.c track.c \
pool.c pool-file.c pool-sub.c \
traceopt.c track.c \
pool.c pool-file.c pool-sub.c \
- atom.c assoc.c darray.c dstr.c dputf.c dspool.c hash.c sym.c \
+ atom.c assoc.c buf-dstr.c darray.c dstr.c dputf.c dspool.c hash.c \
+ sym.c \
crc32.c crc32-tab.c \
unihash.c unihash-global.c \
env.c fdflags.c fdpass.c fwatch.c lock.c \
crc32.c crc32-tab.c \
unihash.c unihash-global.c \
env.c fdflags.c fdpass.c fwatch.c lock.c \
@@
-75,13
+77,13
@@
libmLib_la_LIBADD = @DEPLIBS@
BUILT_SOURCES = crc32-tab.c unihash-global.c
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
./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
./unihash-mkstatic \
-c -sunihash_global -iunihash.h -ounihash-global.c.new
mv unihash-global.c.new unihash-global.c
@@
-89,9
+91,11
@@
unihash-global.c: unihash-mkstatic
crc_mktab_SOURCES = \
crc-mktab.c \
mdwopt.c quis.c pquis.c report.c str.c
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_SOURCES = \
unihash-mkstatic.c \
mdwopt.c quis.c pquis.c report.c str.c unihash.c
+unihash_mkstatic_CFLAGS = $(AM_CFLAGS)
## --- Test code ---
## --- Test code ---
@@
-193,12
+197,12
@@
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
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.test: unihash.t unihash.in
- ./unihash.t -f unihash.in
+ ./unihash.t -f
$(srcdir)/
unihash.in
TEST_CLEAN = \
TEST_CLEAN = \
- *.t *.to \
+ *.t *.to
assoc.out
\
da.in da.ref da.out \
sym.in sym.ref sym.out \
base64.out base32.out hex.out unihash.in
da.in da.ref da.out \
sym.in sym.ref sym.out \
base64.out base32.out hex.out unihash.in
@@
-207,6
+211,7
@@
TEST_DIST = \
da-gtest da-ref \
sym-gtest sym-ref \
bits.in bits-testgen.c \
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 ---
base64.in base64.ref base32.in base32.ref hex.in hex.ref
## --- Background resolver ---
@@
-214,11
+219,8
@@
TEST_DIST = \
## I must (a) build the standalone version, and (b) inform the client library
## where the standalone version is.
## 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
bres.lo: $(srcdir)/bres.c
$(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/$(PACKAGE)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c
@@
-230,7
+232,7
@@
install-man:
uninstall-man:
(cd man && $(MAKE) uninstall-man)
uninstall-man:
(cd man && $(MAKE) uninstall-man)
-CLEANFILES = $(TEST_CLEAN) crc32-tab.c
+CLEANFILES = $(TEST_CLEAN) crc32-tab.c
unihash-global.c
DISTCLEANFILES = libtool
EXTRA_DIST = \
$(TEST_DIST) maninst \
DISTCLEANFILES = libtool
EXTRA_DIST = \
$(TEST_DIST) maninst \