[geos-commits] r2843 - trunk/capi

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-12 21:08:20 -0500 (Tue, 12 Jan 2010)
New Revision: 2843

Modified:
   trunk/capi/Makefile.am
Log:
Updated Makefile.am files in capi subtree after moved to new location (#315)

Modified: trunk/capi/Makefile.am
===================================================================
--- trunk/capi/Makefile.am	2010-01-13 02:01:12 UTC (rev 2842)
+++ trunk/capi/Makefile.am	2010-01-13 02:08:20 UTC (rev 2843)
@@ -1,3 +1,7 @@
+# $Id$
+#
+# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+#
 prefix=@prefix@
 top_srcdir=@top_srcdir@
 GEOS_CAPI_VERSION="@VERSION at -CAPI-@CAPI_VERSION@"
@@ -3,25 +7,27 @@
 GEOS_JTS_PORT="@JTS_PORT@"
 
-INCLUDES = -I$(top_srcdir)/source/headers
+INCLUDES = -I$(top_srcdir)/include
 
 capidir = $(includedir)
 
 nodist_capi_HEADERS = \
-	geos_c.h
+    geos_c.h
 
 lib_LTLIBRARIES = libgeos_c.la
 
 DIR_SOURCES = \
-	geos_c.cpp geos_ts_c.cpp
+    geos_c.cpp \
+    geos_ts_c.cpp \
+    $(NULL)
 
 libgeos_c_la_SOURCES = $(DIR_SOURCES)
 libgeos_c_la_CPPFLAGS = -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
-libgeos_c_la_LIBADD = $(top_builddir)/source/libgeos.la
+libgeos_c_la_LIBADD = $(top_builddir)/src/libgeos.la
 libgeos_c_la_LDFLAGS = \
-	-version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \
-	-no-undefined
+    -version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \
+    -no-undefined
 
 dist-local:
-	cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
+    cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
 
 EXTRA_DIST = geos_c.h