diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-02-20 15:34:14 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-02-20 15:34:14 +0000 |
| commit | 60ea34b046465be4db60aeecd0df74f213ce03eb (patch) | |
| tree | 256aed726eef45285adafa2691bcf778f18acdf7 /contrib/pgcrypto/Makefile | |
| parent | d18c1d1f51023bf9cf82ce555f2c8efca92060ee (diff) | |
| download | postgresql-60ea34b046465be4db60aeecd0df74f213ce03eb.tar.gz | |
Changes:
* reverse the change #include <> -> "" in krb.c.
It _must not_ include files in "."
* Makefile update. Inconsistent var usage and SHLIB was
not set.
Now it should work with all external libs.
arko Kreen
Diffstat (limited to 'contrib/pgcrypto/Makefile')
| -rw-r--r-- | contrib/pgcrypto/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile index 4e32fdd6fb..85a11c029a 100644 --- a/contrib/pgcrypto/Makefile +++ b/contrib/pgcrypto/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/pgcrypto/Makefile,v 1.2 2001/01/24 03:46:16 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/pgcrypto/Makefile,v 1.3 2001/02/20 15:34:14 momjian Exp $ # subdir = contrib/pgcrypto @@ -12,34 +12,37 @@ cryptolib = builtin ########################## ifeq ($(cryptolib), builtin) -SRCS= md5.c sha1.c internal.c +CRYPTO_CFLAGS = +CRYPTO_LDFLAGS = +SRCS = md5.c sha1.c internal.c endif ifeq ($(cryptolib), openssl) -cryptoinc := -I/usr/include/openssl -cryptolib := -lcrypto +CRYPTO_CFLAGS = -I/usr/include/openssl +CRYPTO_LDFLAGS = -lcrypto SRCS = openssl.c endif ifeq ($(cryptolib), mhash) -cryptoinc= -cryptolib=-lmhash -SRCS=mhash.c +CRYPTO_CFLAGS = -I/usr/local/include +CRYPTO_LDFLAGS = -L/usr/local/lib -lmhash +SRCS = mhash.c endif ifeq ($(cryptolib), krb5) -cryptoinc=-I/usr/include -cryptolib=-ldes -SRCS=krb.c +CRYPTO_CFLAGS = -I/usr/include +CRYPTO_LDFLAGS = -ldes +SRCS = krb.c endif NAME := pgcrypto SRCS += pgcrypto.c encode.c OBJS := $(SRCS:.c=.o) +SHLIB_LINK := $(CRYPTO_LDFLAGS) SO_MAJOR_VERSION = 0 SO_MINOR_VERSION = 1 -override CPPFLAGS += -I$(srcdir) $(cryptoinc) +override CPPFLAGS += $(CRYPTO_CFLAGS) -I$(srcdir) all: all-lib $(NAME).sql |