Index: trunk/pois/src/Makefile.am
===================================================================
--- trunk/pois/src/Makefile.am	(revision 3829)
+++ trunk/pois/src/Makefile.am	(revision 3830)
@@ -1,16 +1,10 @@
-AM_CFLAGS = @pois_CFLAGS@
+AM_CFLAGS = $(pois_CFLAGS) $(PSLIB_CFLAGS)
+AM_LDFLAGS = $(PSLIB_LIBS)
 
 include_HEADERS = pois.h poisErrorCodes.h
+lib_LTLIBRARIES = libpois.la
+noinst_PROGRAMS = pois
 
-AM_CFLAGS  += $(PSLIB_CFLAGS)
-LIBS       = $(PSLIB_LIBS) $(AM_LIBS)
-AM_LDFLAGS = -release $(PACKAGE_VERSION)
-
-#noinst_PROGRAMS = pois
-lib_LTLIBRARIES = libpois.la
-
-BUILT_SOURCES = \
-	poisErrorCodes.h errorCodes.c
-
+pois_LDADD = libpois.la
 pois_SOURCES = \
 	pois.c
@@ -19,4 +13,8 @@
 # Build a library
 #
+BUILT_SOURCES = \
+	poisErrorCodes.h errorCodes.c
+
+libpois_la_LDFLAGS = $(AM_LDFLAGS) -release $(PACKAGE_VERSION)
 libpois_la_SOURCES = \
 	pois.h \