diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-07-09 13:14:19 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-07-09 13:14:19 +0000 |
| commit | 74618e2b82b5158adf42caf64af70cbd7c699c6c (patch) | |
| tree | f4782dc597569b1e2feb6ac50cad217dc39f35ee /contrib/pgbench | |
| parent | b59c03f84206ed3f3f864dcbe337ec04b2a8558d (diff) | |
| download | postgresql-74618e2b82b5158adf42caf64af70cbd7c699c6c.tar.gz | |
Another round of those unportable config/build changes :-/
* Add option to build with OpenSSL out of the box. Fix thusly exposed
bit rot. Although it compiles now, getting this to do something
useful is left as an exercise.
* Fix Kerberos options to defer checking for required libraries until
all the other libraries are checked for.
* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.
* Install work around for Autoconf's install-sh relative path anomaly.
Get rid of old INSTL_*_OPTS variables, now that we don't need them
anymore.
* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.
* Look for only one of readline.h or readline/readline.h, not both.
* Make check for PS_STRINGS cacheable. Don't test for the header files
separately.
* Disable fcntl(F_SETLK) test on Linux.
* Substitute the standard GCC warnings set into CFLAGS in configure,
don't add it on in Makefile.global.
* Sweep through contrib tree to teach makefiles standard semantics.
... and in completely unrelated news:
* Make postmaster.opts arbitrary options-aware. I still think we need to
save the environment as well.
Diffstat (limited to 'contrib/pgbench')
| -rw-r--r-- | contrib/pgbench/Makefile | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index c9f7c3f2b2..8db147cce7 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -1,48 +1,26 @@ # -# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.4 2000/06/19 13:54:09 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $ # -TOPDIR=../.. +subdir = contrib/pgbench +top_builddir = ../.. +include ../../src/Makefile.global -include ../Makefile.global +CFLAGS += -I$(LIBPQDIR) +LIBS += $(LIBPQ) -NAME = pgbench +all: pgbench -PROGRAM = $(NAME) -OBJS = $(NAME).o -DOCS = README.$(NAME) README.$(NAME)_jis -SQLS = -BINS = $(PROGRAM) -EXAMPLES= -MODS = +install: all installdirs + $(INSTALL_PROGRAM) pgbench$(X) $(bindir) + $(INSTALL_DATA) README.pgbench $(docdir)/contrib + $(INSTALL_DATA) README.pgbench_jis $(docdir)/contrib -CFLAGS += -I$(LIBPQDIR) +installdirs: + $(mkinstalldirs) $(bindir) $(docdir)/contrib -OTHER_CLEAN = +uninstall: + rm -f $(bindir)/pgbench$(X) $(docdir)/contrib/README.pgbench $(docdir)/contrib/README.pgbench_jis -all: $(PROGRAM) - -$(PROGRAM): $(OBJS) $(LIBPQDIR)/libpq.a - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) - -install: install_doc install_bin - -install_doc: - for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ - done - -install_bin: - for inst_file in $(BINS); do \ - $(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \ - done - -depend dep: - $(CC) -MM -MG $(CFLAGS) *.c > depend - -clean: - $(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log - -ifeq (depend,$(wildcard depend)) -include depend -endif +clean distclean maintainer-clean: + rm -f pgbench$(X) |