Final cleanup prior to incorporating the veil schema

diff --git a/GNUmakefile b/GNUmakefile
index 5ef14d05b8f03858a9653ea619e5c28a5e4a1aef..64064b9e5750f5432ad9a11d541ee9ff4ea902ff 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,11 +9,10 @@
 # For a list of targets use make help.
 # 
 
+# Default target.  Dependencies for this are further defined in the 
+# included makefiles for SUBDIRS below.
 all:
 
-SUBDIRS = src regress docs demo
-include $(SUBDIRS:%=%/Makefile)
-
 BUILD_DIR = $(shell pwd)
 MODULE_big = veil
 OBJS = $(SOURCES:%.c=%.o)
@@ -26,6 +25,10 @@ VEIL_VERSION = $(shell \
 
 VEIL_CONTROL = veil--$(VEIL_VERSION).sql
 
+SUBDIRS = src regress docs demo
+include $(SUBDIRS:%=%/Makefile)
+
+
 DATA = $(wildcard veil--*.sql)
 ALLDOCS = $(wildcard docs/html/*)
 # Only define DOCS (for the install target) if there are some.
@@ -38,7 +41,6 @@ PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 include $(DEPS)
 
-
 # Build per-source dependency files for inclusion
 # This ignores header files and any other non-local files (such as
 # postgres include files).  Since I don't know if this will work
@@ -63,11 +65,6 @@ deps:
    rm -f $(DEPS)
    $(MAKE) MAKEFLAGS="$(MAKEFLAGS)" make_deps
 
-# Recursive make is used to cope with pgxs' inability to build more than
-# one library per makefile.   We recursively use this makefile to build
-# the veil_trial shared library.
-all: $(DATA)
-
 # Define some variables for the following tarball targets.
 tarball tarball_clean: VEIL_DIR=veil_$(VEIL_VERSION)
 
@@ -95,15 +92,6 @@ tarball_clean:
 # Ensure that tarball tmp files and dirs are removed by the clean target
 clean: tarball_clean
 
-ifndef VARIANT
-# Explicit target for veil_trial library.  Only required for non-variant
-# builds as the target is otherwise defined automatically.
-$(addsuffix $(DLSUFFIX), veil_trial):  $(TRIAL_SOURCES)
-   @if [ "x$(VARIANT)" = "x" ]; then \
-       $(MAKE) MAKEFLAGS="$(MAKEFLAGS)" VARIANT=veil_trial $@; \
-   fi
-endif
-
 # Install veil_demo as well as veil
 install: demo_install
 demo_install:

diff --git a/regress/regress.log b/regress/regress.log
index 64a84ef2c36ccc7c7705769a0ee506e4a38b8991..6335aff0187aec69db7ddf533069f8860f3afd74 100644 (file)
--- a/regress/regress.log
+++ b/regress/regress.log
@@ -1926,11 +1926,3 @@ passed:    117
 failed:    0
 
 - Dropping regressdb...
-- Dropping regressdb...
-dropdb: database removal failed: ERROR:  database "regressdb" does not exist
-- Dropping regressdb...
-dropdb: database removal failed: ERROR:  database "regressdb" does not exist
-- Dropping regressdb...
-dropdb: database removal failed: ERROR:  database "regressdb" does not exist
-- Dropping regressdb...
-dropdb: database removal failed: ERROR:  database "regressdb" does not exist

diff --git a/src/Makefile b/src/Makefile
index 6865a95e8c6c96fbe45b4620728cae3c71f2b004..97d9962595884bd23c84e56e947d9a3042478696 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,5 +39,5 @@ all: $(VEIL_CONTROL)
 
 $(VEIL_CONTROL): src/veil_interface.sqs
    @echo Creating $(VEIL_CONTROL)
-   @sed -e 's!@LIBPATH@!$$libdir/veil!g' <$< >$(VEIL_CONTROL)
+   @sed -e 's!@LIBPATH@!$$libdir/veil!g' <$< >$@
 

diff --git a/src/veil_interface.sqs b/src/veil_interface.sqs
index 25b003673aec821f3b577f020ad9d8839d05cbbd..64b25a4846aff64b6d84054445fb5393f0351211 100644 (file)
--- a/src/veil_interface.sqs
+++ b/src/veil_interface.sqs
@@ -1,8 +1,8 @@
 /* ----------
  * veil_interface.sqs (or a file derived from it)
  *
- *      Source file from which veil_interface_trial.sql and
- *      veil--<version>.sql is generated using sed.
+ *      Source file from which veil--<version>.sql is generated using
+ * sed. 
  *
  *      Copyright (c) 2005 - 2011 Marc Munro
  *      Author:  Marc Munro
@@ -11,6 +11,12 @@
  * ----------
  */
 
+create schema veil;
+comment on schema veil is
+'Schema containing all veil components.';
+
+
+
 create type veil_range_t as (
     min  int4,
     max  int4

diff --git a/veil--1.0.sql b/veil--1.0.sql
index e1a912dedd606ec90fb31cb4c326e94d5663ee1b..4dff5cb53f5510e8d85532215e65583a4bc6727f 100644 (file)
--- a/veil--1.0.sql
+++ b/veil--1.0.sql
@@ -1,8 +1,8 @@
 /* ----------
  * veil_interface.sqs (or a file derived from it)
  *
- *      Source file from which veil_interface_trial.sql and
- *      veil--<version>.sql is generated using sed.
+ *      Source file from which veil--<version>.sql is generated using
+ * sed. 
  *
  *      Copyright (c) 2005 - 2011 Marc Munro
  *      Author:  Marc Munro

diff --git a/veil.control b/veil.control
index f2350bc7bf7e847da58b6cc48f214a2578ff6601..a55c85d718a5bda064f2aa4fdbf3653421098d33 100644 (file)
--- a/veil.control
+++ b/veil.control
@@ -11,6 +11,6 @@ directory       = 'extension/veil'
 default_version = '1.0'
 module_pathname = '$libdir/veil'
 superuser       = true
-relocatable     = true
+relocatable     = false
 
 comment = 'Provides tools for building row-level access controls.'