Log Message:
-----------
Change xxid Makefile rules so that xxid.v74.sql file doesn't get purged by 
"make clean", and to eliminate references to the v73 file, now obsolete.

Modified Files:
--------------
    slony1-engine/src/xxid:
        Makefile (r1.24 -> r1.25)

Removed Files:
-------------
    slony1-engine/src/xxid:
        xxid.v73.sql

-------------- next part --------------
--- src/xxid/xxid.v73.sql
+++ /dev/null
@@ -1,185 +0,0 @@
--- ----------
--- xxid.v73.sql.in
---
---	SQL script for loading the transaction ID compatible datatype 
---
---	Copyright (c) 2003-2004, PostgreSQL Global Development Group
---	Author: Jan Wieck, Afilias USA INC.
---
--- $Id: xxid.v73.sql,v 1.3 2005/05/11 22:00:07 cbbrowne Exp $
--- ----------
-
---
--- Type specific input and output functions
---
-CREATE FUNCTION @NAMESPACE at ."xxidin"(cstring) RETURNS @NAMESPACE at ."xxid"
-	AS '$libdir/xxid', '_Slony_I_xxidin'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidout"(@NAMESPACE at ."xxid") RETURNS cstring
-	AS '$libdir/xxid', '_Slony_I_xxidout'
-	LANGUAGE C;
-
-
---
--- The data type itself
---
-CREATE TYPE @NAMESPACE at ."xxid" (
-	INPUT = @NAMESPACE at ."xxidin",
-	OUTPUT = @NAMESPACE at ."xxidout",
-	EXTERNALLENGTH = 12,
-	INTERNALLENGTH = 4,
-	PASSEDBYVALUE,
-	ALIGNMENT = int4
-);
-
-
---
--- Since our xxid type has special cases for values 0-3, it
--- in fact IS xid, so allow implicit type casting to and from.
---
-CREATE CAST (xid AS @NAMESPACE at .xxid)
-	WITHOUT FUNCTION AS IMPLICIT;
-CREATE CAST (@NAMESPACE at .xxid AS xid)
-	WITHOUT FUNCTION AS IMPLICIT;
-
-
---
--- Comparision functions for the new datatype
---
-CREATE FUNCTION @NAMESPACE at ."xxideq"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxideq'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidne"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxidne'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidlt"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxidlt'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidle"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxidle'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidgt"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxidgt'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxidge"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxidge'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."btxxidcmp"(@NAMESPACE at ."xxid", @NAMESPACE at ."xxid") RETURNS int4
-	AS '$libdir/xxid', '_Slony_I_btxxidcmp'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at .getCurrentXid() RETURNS @NAMESPACE at ."xxid"
-	AS '$libdir/xxid', '_Slony_I_getCurrentXid'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at .getMinXid() RETURNS @NAMESPACE at ."xxid"
-	AS '$libdir/xxid', '_Slony_I_getMinXid'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at .getMaxXid() RETURNS @NAMESPACE at ."xxid"
-	AS '$libdir/xxid', '_Slony_I_getMaxXid'
-	LANGUAGE C;
-
-
---
--- Operators on these comparision functions
---
-CREATE OPERATOR < (
-	PROCEDURE = @NAMESPACE at ."xxidlt",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = >, NEGATOR = >=,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-CREATE OPERATOR = (
-	PROCEDURE = @NAMESPACE at ."xxideq",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = =, NEGATOR = <>,
-	RESTRICT = eqsel, JOIN = eqjoinsel,
-	SORT1 = <, SORT2 = <
-);
-CREATE OPERATOR <> (
-	PROCEDURE = @NAMESPACE at ."xxidne",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = <>, NEGATOR = =,
-	RESTRICT = neqsel, JOIN = neqjoinsel
-);
-CREATE OPERATOR > (
-	PROCEDURE = @NAMESPACE at ."xxidgt",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = <, NEGATOR = <=,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-CREATE OPERATOR <= (
-	PROCEDURE = @NAMESPACE at ."xxidle",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = >=, NEGATOR = >,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-CREATE OPERATOR >= (
-	PROCEDURE = @NAMESPACE at ."xxidge",
-	LEFTARG = @NAMESPACE at ."xxid",
-	RIGHTARG = @NAMESPACE at ."xxid",
-	COMMUTATOR = <=, NEGATOR = <,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-
---
--- Finally the default operator class so that we can use our
--- new data type in btree indexes.
---
-CREATE OPERATOR CLASS @NAMESPACE at ."xxid_ops"
-	DEFAULT FOR TYPE @NAMESPACE at ."xxid" USING btree AS
-	OPERATOR 1 <  (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid"),
-	OPERATOR 2 <= (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid"),
-	OPERATOR 3 =  (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid"),
-	OPERATOR 4 >= (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid"),
-	OPERATOR 5 >  (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid"),
-	FUNCTION 1 @NAMESPACE at ."btxxidcmp" (@NAMESPACE at ."xxid", @NAMESPACE at ."xxid");
-
-
---
--- A special transaction snapshot data type for faster visibility checks
---
-CREATE FUNCTION @NAMESPACE at ."xxid_snapshot_in"(cstring)
-RETURNS @NAMESPACE at ."xxid_snapshot"
-	AS '$libdir/xxid', '_Slony_I_xxid_snapshot_in'
-	LANGUAGE C;
-CREATE FUNCTION @NAMESPACE at ."xxid_snapshot_out"(@NAMESPACE at ."xxid_snapshot")
-RETURNS cstring
-	AS '$libdir/xxid', '_Slony_I_xxid_snapshot_out'
-	LANGUAGE C;
-
-
---
--- The data type itself
---
-CREATE TYPE @NAMESPACE at ."xxid_snapshot" (
-	INPUT = @NAMESPACE at ."xxid_snapshot_in",
-	OUTPUT = @NAMESPACE at ."xxid_snapshot_out",
-	INTERNALLENGTH = variable,
-	ALIGNMENT = int4
-);
-
-
---
--- Special comparision functions used by the remote worker
--- for sync chunk selection
---
-CREATE FUNCTION @NAMESPACE at ."xxid_lt_snapshot"(
-		@NAMESPACE at ."xxid",
-		@NAMESPACE at ."xxid_snapshot")
-RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxid_lt_snapshot'
-	LANGUAGE C;
-
-CREATE FUNCTION @NAMESPACE at ."xxid_ge_snapshot"(
-		@NAMESPACE at ."xxid",
-		@NAMESPACE at ."xxid_snapshot")
-RETURNS boolean
-	AS '$libdir/xxid', '_Slony_I_xxid_ge_snapshot'
-	LANGUAGE C;
-
-
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/xxid/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/xxid/Makefile -Lsrc/xxid/Makefile -u -w -r1.24 -r1.25
--- src/xxid/Makefile
+++ src/xxid/Makefile
@@ -20,6 +20,7 @@
 SQL_NAME74	= $(NAME).v74.sql
 SQL_NAME80	= $(NAME).v80.sql
 SQL_NAMES	= $(SQL_NAME74) $(SQL_NAME80)
+GENSQLNAMES = $(filter-out $(SQL_NAME74), $(SQL_NAMES))
 
 SO_OBJS		= xxid.o $(WIN32RES)
 
@@ -38,7 +39,7 @@
 
 clean distclean maintainer-clean:
 	rm -f $(SO_NAME) $(SO_OBJS)
-	rm -f $(SQL_NAMES)
+	rm -f $(GENSQLNAMES)
 
 install: all installdirs
 	$(INSTALL_SCRIPT) $(SO_NAME) $(DESTDIR)$(pgpkglibdir)