Changeset 691 for trunk/src/Makefile.am

Timestamp:

04/06/08 14:13:13 (9 months ago)

Author:

andreas

Message:

- updated autotools build files
- build now osm plugin automatic if libxml2 is used
- moved osm/Makefile to osm/Makefile.example because if name collision

-> better move the example to another directory later

- optional CAIRO support
- changed libxml2 switch comment

Files:

• trunk/src/Makefile.am (modified) (4 diffs)

trunk/src/Makefile.am

@@ -3 +3 @@
 ## Created by Anjuta
 
-INCLUDES = \
-        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-        -DPACKAGE_DATA_DIR=\""$(datadir)"\"
+INCLUDES = 
 
 AM_CXXFLAGS =\
-         -Wall \
-   -g
+         -Wall 
 
 lib_LTLIBRARIES = \
@@ -17 +13 @@
 if HAVE_LIBXML2
 libxml2_src = \
-  libxml2_loader.cpp
+        libxml2_loader.cpp
 endif
+
+if HAVE_CAIRO
+cairo_src = \
+        cairo_renderer.cpp 
+endif
+
 
 libmapnik_la_SOURCES = \
         agg_renderer.cpp \
         arrow.cpp \
+        ${cairo_src} \
         datasource_cache.cpp \
         distance.cpp \
@@ -69 +72 @@
         ${PROJ_LIBS} \
         ${LTDL_LIBS} \
-        ${LIBXML2_LIBS}
+        ${LIBXML2_LIBS} \
+        ${CAIRO_LIBS}
 
 libmapnik_la_CXXFLAGS = \
@@ -81 +85 @@
         ${LTDL_CFLAGS} \
         ${BOOST_CPPFLAGS} \
-        ${LIBXML2_CFLAGS}
+        ${LIBXML2_CFLAGS} \
+        ${CAIRO_CFLAGS}