diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-08-20 20:13:10 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-08-20 20:13:10 +0000 |
| commit | ee85595d467ef6fad3afb0554b27e6ee9f061318 (patch) | |
| tree | a989fe7c6cb179bbb7acfc8e2df42b84c2962cd8 /contrib/pgcrypto | |
| parent | ff8e5526dd6a2b2e1378fc2e9b22ff4ad5fb07b5 (diff) | |
| download | postgresql-ee85595d467ef6fad3afb0554b27e6ee9f061318.tar.gz | |
> Please find enclose a submission to fix these problems.
>
> The patch adds missing the "libpgport.a" file to the installation under
> "install-all-headers". It is needed by some contribs. I install the
> library in "pkglibdir", but I was wondering whether it should be "libdir"?
> I was wondering also whether it would make sense to have a "libpgport.so"?
>
> It fixes various macros which are used by contrib makefiles, especially
> libpq_*dir and LDFLAGS when used under PGXS. It seems to me that they are
> needed to
>
> It adds the ability to test and use PGXS with contribs, with "make
> USE_PGXS=1". Without the macro, this is exactly as before, there should be
> no difference, esp. wrt the vpath feature that seemed broken by previous
> submission. So it should not harm anybody, and it is useful at least to me.
>
> It fixes some inconsistencies in various contrib makefiles
> (useless override, ":=" instead of "=").
Fabien COELHO
Diffstat (limited to 'contrib/pgcrypto')
| -rw-r--r-- | contrib/pgcrypto/Makefile | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile index 8d787500a7..429c837925 100644 --- a/contrib/pgcrypto/Makefile +++ b/contrib/pgcrypto/Makefile @@ -1,11 +1,7 @@ # -# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.10 2003/11/29 19:51:35 pgsql Exp $ +# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.11 2004/08/20 20:13:06 momjian Exp $ # -subdir = contrib/pgcrypto -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global - # either 'builtin', 'mhash', 'openssl' cryptolib = builtin @@ -60,25 +56,35 @@ ifeq ($(random), silly) CRYPTO_CFLAGS += -DRAND_SILLY endif -MODULE_big := pgcrypto SRCS += pgcrypto.c px.c px-hmac.c px-crypt.c misc.c \ crypt-gensalt.c random.c -OBJS := $(SRCS:.c=.o) -DOCS := README.pgcrypto -DATA_built := pgcrypto.sql -EXTRA_CLEAN := gen-rtab -PG_CPPFLAGS := $(CRYPTO_CFLAGS) -I$(srcdir) -SHLIB_LINK := $(CRYPTO_LDFLAGS) +MODULE_big = pgcrypto +OBJS = $(SRCS:.c=.o) +DOCS = README.pgcrypto +DATA_built = pgcrypto.sql +EXTRA_CLEAN = gen-rtab -REGRESS := init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ +PG_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(srcdir) +SHLIB_LINK = $(CRYPTO_LDFLAGS) + +REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ crypt-des crypt-md5 crypt-blowfish crypt-xdes + +ifdef USE_PGXS +PGXS = $(shell pg_config --pgxs) +include $(PGXS) +else +subdir = contrib/pgcrypto +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk +endif + rijndael.o: rijndael.tbl rijndael.tbl: $(CC) $(CPPFLAGS) $(CFLAGS) -DPRINT_TABS rijndael.c -o gen-rtab ./gen-rtab > rijndael.tbl - |