Add missing files to 'make dist'

diff --git a/Makefile b/Makefile
index b787343352a62143fc1ffcbfce5d83cc30bcbf8a..8f1d49563f07ddd81b067627718ed36fb50bfb33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ pgbouncer_SOURCES = \
        include/bouncer.h \
        include/client.h \
        include/dnslookup.h \
+       include/hba.h \
        include/iobuf.h \
        include/janitor.h \
        include/loader.h \
@@ -52,18 +53,14 @@ dist_doc_DATA = README.rst NEWS.rst etc/pgbouncer.ini etc/userlist.txt
 
 DISTCLEANFILES = config.mak config.status lib/usual/config.h config.log
 
-DIST_SUBDIRS = doc
+DIST_SUBDIRS = doc test
 dist_man_MANS = doc/pgbouncer.1 doc/pgbouncer.5
 
 # files in tgz
-EXTRA_DIST = AUTHORS COPYRIGHT Makefile \
-            config.mak.in etc/mkauth.py \
-            config.sub config.guess install-sh autogen.sh \
-            configure configure.ac \
+EXTRA_DIST = AUTHORS COPYRIGHT Makefile config.mak.in config.sub config.guess \
+            install-sh autogen.sh configure configure.ac \
             debian/compat debian/changelog debian/control debian/rules debian/copyright \
-            test/Makefile test/asynctest.c test/conntest.sh test/ctest6000.ini \
-            test/ctest7000.ini test/run-conntest.sh test/stress.py test/test.ini \
-            test/test.sh test/userlist.txt etc/example.debian.init.sh \
+            etc/mkauth.py etc/example.debian.init.sh \
             win32/Makefile \
             $(LIBUSUAL_DIST)
 

diff --git a/test/Makefile b/test/Makefile
index 368b5982e992ddc9437ba362cea3f2aa37cf538c..0b3e2e8fcf4a7608bc181c352fc7aa0791be347f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,14 +10,25 @@
 
 USUAL_DIR = ../lib
 
+SUBLOC = test
+DIST_SUBDIRS = ssl
+
+EXTRA_DIST = conntest.sh ctest6000.ini ctest7000.ini run-conntest.sh \
+            hba_test.eval hba_test.rules Makefile \
+            test.ini test.sh stress.py userlist.txt
+
 noinst_PROGRAMS = hba_test
 hba_test_CPPFLAGS = -I../include
 hba_test_CFLAGS = -O0
 hba_test_SOURCES = hba_test.c ../src/hba.c ../src/util.c
 hba_test_EMBED_LIBUSUAL = 1
 
+EXTRA_PROGRAMS = asynctest
+asynctest_SOURCES = asynctest.c
+
 AM_FEATURES = libusual
 
+
 include ../config.mak
 include ../lib/mk/antimake.mk
 

diff --git a/test/ssl/Makefile b/test/ssl/Makefile
new file mode 100644 (file)
index 0000000..d764503
--- /dev/null
+++ b/test/ssl/Makefile
@@ -0,0 +1,14 @@
+
+EXTRA_DIST = lib.sh newca.sh newsite.sh test.ini test.sh Makefile \
+            TestCA1/ca.crt TestCA1/ca.key TestCA1/config.ini \
+            TestCA1/index.txt TestCA1/serial \
+            TestCA1/certs/01.pem TestCA1/certs/02.pem TestCA1/certs/03.pem \
+            TestCA1/sites/01-localhost.crt TestCA1/sites/01-localhost.key TestCA1/sites/01-localhost.csr \
+            TestCA1/sites/02-bouncer.crt TestCA1/sites/02-bouncer.key TestCA1/sites/02-bouncer.csr \
+            TestCA1/sites/03-random.crt TestCA1/sites/03-random.key TestCA1/sites/03-random.csr
+
+SUBLOC = test/ssl
+
+include ../../config.mak
+include ../../lib/mk/antimake.mk
+