Draft tgz generation.

diff --git a/Makefile b/Makefile
index b505bb7ec87c9d66d526c8878af7d738b41b53e2..aac55eed9bae066fef1df1fef504ec95f6efb294 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ HDRS = client.h loader.h objects.h pooler.h proto.h sbuf.h server.h util.h \
 DOCS = doc/overview.txt doc/usage.txt doc/config.txt doc/todo.txt
 MANPAGES = doc/pgbouncer.1 doc/pgbouncer.5
 DATA = README NEWS AUTHORS COPYRIGHT etc/pgbouncer.ini etc/userlist.txt Makefile \
-       config.mak.in include/config.h.in etc/mkauth.py \
+       config.mak.in etc/mkauth.py \
        configure configure.ac debian/packages debian/changelog doc/Makefile \
        test/Makefile test/asynctest.c test/conntest.sh test/ctest6000.ini \
        test/ctest7000.ini test/run-conntest.sh test/stress.py test/test.ini \
@@ -42,7 +42,7 @@ hdrs = $(local_hdrs) $(USUAL_HDRS)
 srcs = $(local_srcs)
 objs = $(addprefix $(builddir)/obj/, $(OBJS)) $(USUAL_OBJS)
 FULL = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-DISTFILES = $(DIRS) $(DATA) $(DOCS) $(srcs) $(hdrs) $(MANPAGES)
+DISTFILES = $(DIRS) $(DATA) $(DOCS) $(local_srcs) $(local_hdrs) $(MANPAGES)
 exe = $(builddir)/pgbouncer$(EXT)
 
 CPPFLAGS := -I$(srcdir)/include $(USUAL_CPPFLAGS) $(CPPFLAGS)
@@ -120,8 +120,17 @@ endif
 # create tarfile
 tgz: config.mak $(DISTFILES) $(MANPAGES)
        rm -rf $(FULL) $(FULL).tgz
+       # tgz for libusual
+       cp config.mak configure lib
+       rm -f lib/*.tgz
+       make -C lib tgz
+       # now create new pgbouncer tree
        mkdir $(FULL)
        (for f in $(DISTFILES); do echo $$f; done) | cpio -pm $(FULL)
+       tar xf lib/*.tgz
+       mv libusual-* $(FULL)/lib
+       rm -f $(FULL)/lib/configure
+       # tgz for pgbouncer
        tar czf $(FULL).tgz $(FULL)
        rm -rf $(FULL)
 

diff --git a/configure.ac b/configure.ac
index 634c6f676743ee0ec13b3d525111c8a830462502..e8ff7cbcee9275075183abf6bb607ff2352607d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(pgbouncer, 1.3.3rc1)
+AC_INIT(pgbouncer, 1.4git)
 AC_CONFIG_SRCDIR(src/janitor.c)
 AC_CONFIG_HEADER(lib/usual/config.h)
 AC_PREREQ([2.59])

diff --git a/lib b/lib
index 470ba989f2f2153ecf3747c1dd22ec9176b975c3..2ee987fc7f7198ff1f4aaf771160e366df2339f9 160000 (submodule)
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 470ba989f2f2153ecf3747c1dd22ec9176b975c3
+Subproject commit 2ee987fc7f7198ff1f4aaf771160e366df2339f9