Import buf from Catacomb; split out the dstr bits, and throw away the mp and

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e5c1f1fe7929963698ba9b730043a595d020cc55..a0779ccc448687011f88d4a836aa55a32352b2b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,8 @@ pkglibexec_PROGRAMS = @BRES_LIBEXEC@
 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 \
@@ -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 = \
-       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 \
-       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 \
@@ -89,9 +91,11 @@ unihash-global.c: unihash-mkstatic$(EXEEXT)
 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 ---
 
@@ -215,11 +219,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