Update build bits.

diff --git a/.bzrignore b/.bzrignore
index 39de210dc4ff7043450899851c8ad78995e2eb47..1757c6a6be57d6eaf3419de7c9263a18a9db7115 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,6 @@
+*.BASE
+*.OTHER
+*.THIS
 *.exe
 *.lo
 *.output

diff --git a/Makefile.am b/Makefile.am
index 65e07090f26d3de5d1ffca1f19b0ff4d37c89c23..82b19a4d91e921883d3602791831d0882936b606 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,9 @@ merge-clean:
        @find ./ | $(GREP) \.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
        @find ./ | $(GREP) \.rpm | xargs rm -f
+       @find ./ | $(GREP) \.THIS | xargs rm -f
+       @find ./ | $(GREP) \.OTHER | xargs rm -f
+       @find ./ | $(GREP) \.BASE | xargs rm -f
        @find ./ | $(GREP) \~$$ | xargs rm -f
        @echo "Files that need to be either removed or checked in:"
        @bzr unknowns

diff --git a/libtest/include.am b/libtest/include.am
index 610521a766a0c0115cebd87f29f368c530f8eeec..33ed871692f090c1a735fc1c68b12fd0e7e9d661 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -29,6 +29,7 @@ noinst_HEADERS+= \
                 libtest/stats.h \
                 libtest/strerror.h \
                 libtest/test.h \
+                libtest/test.hpp \
                 libtest/visibility.h
 
 noinst_LTLIBRARIES+= libtest/libserver.la