Index: /trunk/glueforge/glueforge.in
===================================================================
--- /trunk/glueforge/glueforge.in	(revision 3907)
+++ /trunk/glueforge/glueforge.in	(revision 3908)
@@ -3,5 +3,5 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: glueforge.in,v 1.7 2005-05-06 04:07:42 jhoblitt Exp $
+# $Id: glueforge.in,v 1.8 2005-05-13 01:37:53 jhoblitt Exp $
 
 use strict;
@@ -51,8 +51,8 @@
 }
 
-$data{object_name} = $data{table_name} . "Row";
-$data{lib_name}    = $data{table_name} . "db";
-$data{file_name}   = $data{lib_name};
+$data{pkg_name}    = $data{table_name} . "db";
+$data{file_name}   = $data{pkg_name};
 $data{namespace}   = $data{table_name};
+$data{object_name} = $data{namespace} . "Row";
 
 my @items;
@@ -77,10 +77,10 @@
 $data{columns} = \@items;
 
-$output = $data{lib_name} unless defined $output;
+$output = $data{pkg_name} unless defined $output;
 
 my %tt = (
     'autogen_sh.tt'         => "$output/autogen.sh",
     'configure_ac.tt'       => "$output/configure.ac",
-    'pkgconfig_pc_in.tt'    => "$output/$data{lib_name}.pc.in",
+    'pkgconfig_pc_in.tt'    => "$output/$data{pkg_name}.pc.in",
     'top_makefile_am.tt'    => "$output/Makefile.am",
     'src_makefile_am.tt'    => "$output/src/Makefile.am",
Index: /trunk/glueforge/templates/psdb/autogen_sh.tt
===================================================================
--- /trunk/glueforge/templates/psdb/autogen_sh.tt	(revision 3907)
+++ /trunk/glueforge/templates/psdb/autogen_sh.tt	(revision 3908)
@@ -8,5 +8,5 @@
 cd $srcdir
 
-PROJECT=[% lib_name %]
+PROJECT=[% pkg_name %]
 TEST_TYPE=-f
 # change this to be a unique filename in the top level dir
Index: /trunk/glueforge/templates/psdb/configure_ac.tt
===================================================================
--- /trunk/glueforge/templates/psdb/configure_ac.tt	(revision 3907)
+++ /trunk/glueforge/templates/psdb/configure_ac.tt	(revision 3908)
@@ -3,6 +3,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([[% lib_name %]], [0.0.1], [pan-starrs.ifa.hawaii.edu])
-AC_CONFIG_SRCDIR([[% lib_name %].pc.in])
+AC_INIT([[% pkg_name %]], [0.0.1], [pan-starrs.ifa.hawaii.edu])
+AC_CONFIG_SRCDIR([[% pkg_name %].pc.in])
 
 AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
@@ -18,7 +18,7 @@
 
 dnl is this the best was to setup recursive CFLAGS?
-[% lib_name %]_CFLAGS="-Wall -pedantic -std=c99"
-AC_SUBST([[% lib_name %]_CFLAGS])
+[% pkg_name %]_CFLAGS="-Wall -pedantic -std=c99"
+AC_SUBST([[% pkg_name %]_CFLAGS])
 
-AC_CONFIG_FILES([% lib_name %].pc Makefile src/Makefile)
+AC_CONFIG_FILES([% pkg_name %].pc Makefile src/Makefile)
 AC_OUTPUT
Index: /trunk/glueforge/templates/psdb/pkgconfig_pc_in.tt
===================================================================
--- /trunk/glueforge/templates/psdb/pkgconfig_pc_in.tt	(revision 3907)
+++ /trunk/glueforge/templates/psdb/pkgconfig_pc_in.tt	(revision 3908)
@@ -4,8 +4,8 @@
 includedir=@includedir@
 
-Name: [% lib_name %]
+Name: [% pkg_name %]
 Description: some library
 Version: @VERSION@
 Requires: pslib
-Libs: -L${libdir} -l[% lib_name %]
+Libs: -L${libdir} -l[% pkg_name %]
 Cflags: -I${includedir}
Index: /trunk/glueforge/templates/psdb/src_makefile_am.tt
===================================================================
--- /trunk/glueforge/templates/psdb/src_makefile_am.tt	(revision 3907)
+++ /trunk/glueforge/templates/psdb/src_makefile_am.tt	(revision 3908)
@@ -1,10 +1,10 @@
-AM_CFLAGS = @[% lib_name %]_CFLAGS@
+AM_CFLAGS = @[% pkg_name %]_CFLAGS@
 
-include_HEADERS = [% lib_name %].h
-lib_LTLIBRARIES = lib[% lib_name %].la
-lib[% lib_name %]_la_CFLAGS  = $(PSLIB_CFLAGS) $(AM_CFLAGS)
-lib[% lib_name %]_la_LIBS    = $(PSLIB_LIBS) $(AM_LIBS)
-lib[% lib_name %]_la_LDFLAGS = -release $(PACKAGE_VERSION)
-lib[% lib_name %]_la_SOURCES = \
-    [% lib_name %].h \
-    [% lib_name %].c
+include_HEADERS = [% pkg_name %].h
+lib_LTLIBRARIES = lib[% pkg_name %].la
+lib[% pkg_name %]_la_CFLAGS  = $(PSLIB_CFLAGS) $(AM_CFLAGS)
+lib[% pkg_name %]_la_LIBS    = $(PSLIB_LIBS) $(AM_LIBS)
+lib[% pkg_name %]_la_LDFLAGS = -release $(PACKAGE_VERSION)
+lib[% pkg_name %]_la_SOURCES = \
+    [% pkg_name %].h \
+    [% pkg_name %].c