From 407d0fb668a78fcc117edf25dab36a8016f3fde5 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Thu, 1 Nov 2007 19:52:20 +0000 Subject: [PATCH] move include files to separate dir --- Makefile | 23 +++++++++++++---------- config.mak.in | 2 +- configure.ac | 4 ++-- {src => include}/aatree.h | 0 {src => include}/admin.h | 0 {src => include}/bouncer.h | 0 {src => include}/client.h | 0 {src => include}/hash.h | 0 {src => include}/janitor.h | 0 {src => include}/list.h | 0 {src => include}/loader.h | 0 {src => include}/mbuf.h | 0 {src => include}/md5.h | 0 {src => include}/objects.h | 0 {src => include}/pktbuf.h | 0 {src => include}/pooler.h | 0 {src => include}/proto.h | 0 {src => include}/sbuf.h | 0 {src => include}/server.h | 0 {src => include}/slab.h | 0 {src => include}/stats.h | 0 {src => include}/system.h | 2 +- {src => include}/takeover.h | 0 {src => include}/util.h | 0 {src => include}/varcache.h | 0 25 files changed, 17 insertions(+), 14 deletions(-) rename {src => include}/aatree.h (100%) rename {src => include}/admin.h (100%) rename {src => include}/bouncer.h (100%) rename {src => include}/client.h (100%) rename {src => include}/hash.h (100%) rename {src => include}/janitor.h (100%) rename {src => include}/list.h (100%) rename {src => include}/loader.h (100%) rename {src => include}/mbuf.h (100%) rename {src => include}/md5.h (100%) rename {src => include}/objects.h (100%) rename {src => include}/pktbuf.h (100%) rename {src => include}/pooler.h (100%) rename {src => include}/proto.h (100%) rename {src => include}/sbuf.h (100%) rename {src => include}/server.h (100%) rename {src => include}/slab.h (100%) rename {src => include}/stats.h (100%) rename {src => include}/system.h (99%) rename {src => include}/takeover.h (100%) rename {src => include}/util.h (100%) rename {src => include}/varcache.h (100%) diff --git a/Makefile b/Makefile index 24fb257..16e2715 100644 --- a/Makefile +++ b/Makefile @@ -10,28 +10,31 @@ HDRS = client.h loader.h objects.h pooler.h proto.h sbuf.h server.h util.h \ # data & dirs to include in tgz DOCS = doc/overview.txt doc/usage.txt doc/config.txt doc/todo.txt MANPAGES = doc/pgbouncer.1 doc/pgbouncer.5 -DATA = README NEWS AUTHORS etc/pgbouncer.ini Makefile config.mak.in config.h.in \ +DATA = README NEWS AUTHORS etc/pgbouncer.ini Makefile config.mak.in include/config.h.in \ 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 \ test/test.sh test/userlist.txt etc/example.debian.init.sh doc/fixman.py -DIRS = doc etc src debian test +DIRS = doc etc include src debian test # keep autoconf stuff separate -include config.mak -ifeq ($(enable_debug),yes) -CFLAGS += -DDBGVER="\"compiled by <$${USER}@`hostname`> at `date '+%Y-%m-%d %H:%M:%S'`\"" -endif - # calculate full-path values OBJS = $(SRCS:.c=.o) -hdrs = $(addprefix $(srcdir)/src/, $(HDRS)) +hdrs = $(addprefix $(srcdir)/include/, $(HDRS)) srcs = $(addprefix $(srcdir)/src/, $(SRCS)) objs = $(addprefix $(builddir)/lib/, $(OBJS)) FULL = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) DISTFILES = $(DIRS) $(DATA) $(DOCS) $(srcs) $(hdrs) $(MANPAGES) +CPPCFLAGS += -I$(srcdir)/include + +ifeq ($(enable_debug),yes) +CPPCFLAGS += -DDBGVER="\"compiled by <$${USER}@`hostname`> at `date '+%Y-%m-%d %H:%M:%S'`\"" +endif + + # Quiet by default, 'make V=1' shows commands V=0 ifeq ($(V), 0) @@ -91,18 +94,18 @@ clean: doc-clean # clean configure results distclean: clean doc-distclean - rm -f config.h config.log config.status config.mak + rm -f include/config.h include/config.h.in~ config.log config.status config.mak rm -rf lib autom4te* # clean autoconf results realclean: distclean doc-realclean - rm -f aclocal* config.h.in configure depcomp install-sh missing + rm -f aclocal* include/config.h.in configure depcomp install-sh missing rm -f tags # generate configure script and config.h.in boot: distclean autoreconf -i -f - rm -rf autom4te* config.h.in~ + rm -rf autom4te* include/config.h.in~ # targets can depend on this to force ./configure config.mak:: diff --git a/config.mak.in b/config.mak.in index a1c56cc..9a2a687 100644 --- a/config.mak.in +++ b/config.mak.in @@ -5,7 +5,7 @@ DEFS = @DEFS@ LIBS = @LIBS@ CC = @CC@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/configure.ac b/configure.ac index 85b7c44..8776f1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(pgbouncer, 1.2.cvs) -AC_CONFIG_SRCDIR(src/bouncer.h) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_SRCDIR(src/janitor.c) +AC_CONFIG_HEADER(include/config.h) dnl Checks for programs. AC_PROG_CC diff --git a/src/aatree.h b/include/aatree.h similarity index 100% rename from src/aatree.h rename to include/aatree.h diff --git a/src/admin.h b/include/admin.h similarity index 100% rename from src/admin.h rename to include/admin.h diff --git a/src/bouncer.h b/include/bouncer.h similarity index 100% rename from src/bouncer.h rename to include/bouncer.h diff --git a/src/client.h b/include/client.h similarity index 100% rename from src/client.h rename to include/client.h diff --git a/src/hash.h b/include/hash.h similarity index 100% rename from src/hash.h rename to include/hash.h diff --git a/src/janitor.h b/include/janitor.h similarity index 100% rename from src/janitor.h rename to include/janitor.h diff --git a/src/list.h b/include/list.h similarity index 100% rename from src/list.h rename to include/list.h diff --git a/src/loader.h b/include/loader.h similarity index 100% rename from src/loader.h rename to include/loader.h diff --git a/src/mbuf.h b/include/mbuf.h similarity index 100% rename from src/mbuf.h rename to include/mbuf.h diff --git a/src/md5.h b/include/md5.h similarity index 100% rename from src/md5.h rename to include/md5.h diff --git a/src/objects.h b/include/objects.h similarity index 100% rename from src/objects.h rename to include/objects.h diff --git a/src/pktbuf.h b/include/pktbuf.h similarity index 100% rename from src/pktbuf.h rename to include/pktbuf.h diff --git a/src/pooler.h b/include/pooler.h similarity index 100% rename from src/pooler.h rename to include/pooler.h diff --git a/src/proto.h b/include/proto.h similarity index 100% rename from src/proto.h rename to include/proto.h diff --git a/src/sbuf.h b/include/sbuf.h similarity index 100% rename from src/sbuf.h rename to include/sbuf.h diff --git a/src/server.h b/include/server.h similarity index 100% rename from src/server.h rename to include/server.h diff --git a/src/slab.h b/include/slab.h similarity index 100% rename from src/slab.h rename to include/slab.h diff --git a/src/stats.h b/include/stats.h similarity index 100% rename from src/stats.h rename to include/stats.h diff --git a/src/system.h b/include/system.h similarity index 99% rename from src/system.h rename to include/system.h index 5ca08dc..ac2689b 100644 --- a/src/system.h +++ b/include/system.h @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include "../config.h" +#include "config.h" #endif #define _GNU_SOURCE diff --git a/src/takeover.h b/include/takeover.h similarity index 100% rename from src/takeover.h rename to include/takeover.h diff --git a/src/util.h b/include/util.h similarity index 100% rename from src/util.h rename to include/util.h diff --git a/src/varcache.h b/include/varcache.h similarity index 100% rename from src/varcache.h rename to include/varcache.h -- 2.39.5