Index: /trunk/glueforge/templates/psdb/src_makefile_am.tt
===================================================================
--- /trunk/glueforge/templates/psdb/src_makefile_am.tt	(revision 3728)
+++ /trunk/glueforge/templates/psdb/src_makefile_am.tt	(revision 3729)
@@ -1,8 +1,8 @@
 include_HEADERS=[% lib_name %].h
 lib_LTLIBRARIES = lib[% lib_name %].la
-lib[% lib_name %]_la_CFLAGS = @PSLIB_CFLAGS@
-lib[% lib_name %]_la_LIBS   = @PSLIB_LIBS@
+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[% lib_name %]_la_SOURCES = \
+    [% lib_name %].h \
     [% lib_name %].c