head	1.11;
access;
symbols
	REL7_1_2:1.9
	REL7_1_STABLE:1.9.0.2
	REL7_1_BETA:1.9
	REL7_1_BETA3:1.9
	REL7_1_BETA2:1.9
	REL7_1:1.9
	REL7_0_PATCHES:1.1.0.6
	REL7_0:1.1
	REL6_5_PATCHES:1.1.0.4
	REL6_5:1.1
	REL6_4:1.1.0.2;
locks; strict;
comment	@# @;


1.11
date	2001.08.07.18.16.01;	author momjian;	state dead;
branches;
next	1.10;

1.10
date	2001.06.18.21.38.02;	author momjian;	state Exp;
branches;
next	1.9;

1.9
date	2000.10.20.21.03.28;	author petere;	state Exp;
branches;
next	1.8;

1.8
date	2000.10.04.19.25.34;	author petere;	state Exp;
branches;
next	1.7;

1.7
date	2000.07.09.13.13.33;	author petere;	state Exp;
branches;
next	1.6;

1.6
date	2000.07.04.16.17.08;	author momjian;	state Exp;
branches;
next	1.5;

1.5
date	2000.06.19.13.54.11;	author momjian;	state Exp;
branches;
next	1.4;

1.4
date	2000.06.16.18.59.13;	author momjian;	state Exp;
branches;
next	1.3;

1.3
date	2000.06.15.18.55.15;	author momjian;	state Exp;
branches;
next	1.2;

1.2
date	2000.05.29.05.44.29;	author tgl;	state Exp;
branches;
next	1.1;

1.1
date	98.04.22.04.20.46;	author scrappy;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Sorry - I should have gotten to this sooner. Here's a patch which you should
be able to apply against what you just committed. It rolls soundex into
fuzzystrmatch.

Remove soundex/metaphone and merge into fuzzystrmatch.

Joe Conway
@
text
@#
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.10 2001/06/18 21:38:02 momjian Exp $
#

subdir = contrib/soundex
top_builddir = ../..
include $(top_builddir)/src/Makefile.global

NAME	:= soundex
SONAME	:= $(NAME)$(DLSUFFIX)

override CPPFLAGS += -I$(srcdir)
override CFLAGS += $(CFLAGS_SL)
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)

all: $(SONAME) $(NAME).sql

$(NAME).sql: $(NAME).sql.in
	sed 's,@@MODULE_FILENAME@@,$(libdir)/contrib/$(SONAME),g' $< >$@@

install: all installdirs
	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib

installdirs:
	$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib

uninstall:
	rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)

clean distclean maintainer-clean:
	rm -f $(SONAME) $(NAME).o $(NAME).sql

depend dep:
	$(CC) -MM -MG $(CFLAGS) *.c > depend

ifeq (depend,$(wildcard depend))
include depend
endif
@


1.10
log
@The attached patch enables the contrib subtree to build cleanly under
Cygwin with the possible exception of mSQL-interface.  Since I don't
have mSQL installed, I skipped this tool.

Except for dealing with a missing getopt.h (oid2name) and HUGE (seg),
the bulk of the patch uses the standard PostgreSQL approach to deal with
Windows DLL issues.

I tested the build aspect of this patch under Cygwin and Linux without
any ill affects.  Note that I did not actually attempt to test the code
for functionality.

The procedure to apply the patch is as follows:

    $ # save the attachment as /tmp/contrib.patch
    $ # change directory to the top of the PostgreSQL source tree
    $ patch -p0 </tmp/contrib.patch

Jason
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.9 2000/10/20 21:03:28 petere Exp $
@


1.9
log
@Add support for VPATH builds, that is, building somewhere else than in the
source directory.  This involves mostly makefiles using $(srcdir) when they
might have used ".".  (Regression tests don't work with this, yet.)

Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS).  Add "override" keyword
in most places, to preserve necessary flags even when the user overrode the
flags.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.8 2000/10/04 19:25:34 petere Exp $
d14 1
@


1.8
log
@Update soundex to new fmgr interface and fix algorithm
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.7 2000/07/09 13:13:33 petere Exp $
d12 2
a13 1
CFLAGS += -I. $(CFLAGS_SL)
@


1.7
log
@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.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.6 2000/07/04 16:17:08 momjian Exp $
d7 1
a7 1
include ../../src/Makefile.global
d17 1
a17 1
	sed -e 's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g' < $< > $@@
d31 1
a31 1
	rm -f $(SONAME) $(NAME).sql
@


1.6
log
@Makefile cleanup from Karel.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.5 2000/06/19 13:54:11 momjian Exp $
d5 3
a7 1
TOPDIR=../..
d9 2
a10 11
include ../Makefile.global

NAME	= soundex

PROGRAM	= 
OBJS	= $(NAME).o
DOCS	= README.$(NAME)
SQLS	= $(NAME).sql
BINS	=
EXAMPLES=
MODS	= $(NAME)$(DLSUFFIX)
d14 1
a14 3
OTHER_CLEAN = $(SQLS)

all: $(MODS) $(SQLS)
d16 2
d19 4
a22 2
%.sql: %.sql.in
	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@@:.sql=$(DLSUFFIX))|" < $< > $@@
d24 2
a25 1
install: install_doc install_sql install_mod 
d27 2
a28 4
install_doc:
	for inst_file in $(DOCS); do \
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
	done
d30 2
a31 9
install_sql:
	for inst_file in $(SQLS); do \
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
	done

install_mod:
	for inst_file in $(MODS); do \
		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
	done
a34 3

clean:
	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
@


1.5
log
@Update to /contrib from Karel.
@
text
@d2 1
a2 1
# $Header$
d27 1
a27 1
	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$@@|" < $< > $@@
@


1.4
log
@Cleanup README Makefile installs.
@
text
@d2 1
a2 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/contrib/soundex/Makefile,v 1.3 2000/06/15 18:55:15 momjian Exp $
d13 1
a13 1
DOCS	= README
d33 1
a33 1
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \
@


1.3
log
@/contrib patch from Karel.
@
text
@d2 1
a2 1
# $Header$
d13 1
a13 1
DOCS	= $(NAME).doc
d33 1
a33 1
		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
@


1.2
log
@Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.
@
text
@a0 1
#-------------------------------------------------------------------------
d2 1
a2 2
# Makefile--
#    Makefile for soundex
a3 1
#-------------------------------------------------------------------------
d5 1
a5 2
PGDIR = ../..
SRCDIR = $(PGDIR)/src
d7 1
a7 1
include $(SRCDIR)/Makefile.global
d9 1
a9 1
CFLAGS += -I. $(CFLAGS_SL)
d11 7
a17 1
MODNAME =	soundex
d19 1
a19 3
MODULE =	$(MODNAME)$(DLSUFFIX)

all:		module sql
d21 1
a21 1
module:		$(MODULE)
d23 1
a23 1
sql:		$(MODNAME).sql
a24 3
install:	$(MODULE)
		cp -p $(MODULE) $(LIBDIR)/modules
		cd $(LIBDIR)/modules; strip $(MODULE)
d27 1
a27 1
		sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@@
d29 1
a29 1
.SUFFIXES: $(DLSUFFIX)
d31 14
a44 2
%$(DLSUFFIX): %.c
		$(CC) $(CFLAGS) -shared -o $@@ $<
d47 1
a47 1
		$(CC) -MM $(CFLAGS) *.c >depend
d50 1
a50 1
		rm -f $(MODULE) $(MODNAME).sql
@


1.1
log
@Missed a few files that were added with the lib/modules patch...
@
text
@d13 1
a13 19
INCLUDE_OPT =	-I ./ \
		-I $(SRCDIR)/ \
		-I $(SRCDIR)/include \
		-I $(SRCDIR)/interfaces/libpq \
		-I $(SRCDIR)/port/$(PORTNAME)

CFLAGS += $(INCLUDE_OPT)

ifeq ($(PORTNAME), linux)
  ifdef LINUX_ELF
    ifeq ($(CC), gcc)
      CFLAGS += -fPIC
    endif
  endif
endif

ifeq ($(PORTNAME), i386_solaris)
  CFLAGS+= -fPIC
endif
d38 1
a38 1
		$(CC) -MM $(INCLUDE_OPT) *.c >depend
@

