summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@gnome.org>2008-03-10 22:31:39 -0500
committerJonathon Jongsma <jjongsma@gnome.org>2008-03-10 22:31:39 -0500
commitf631ee50a4e59babe3e4c07e9c59cbff471c1cd5 (patch)
tree3efbd3b028d0b1a45ab8489e25bb92d221ad9f63
parentae6c439be803bea9bce1fb4fd32c7dd8d0cde317 (diff)
install config headerv1.4.8
* cairomm/Makefile.am: install the new cairommconfig.h header and make sure that the .in file is distributed
-rw-r--r--ChangeLog5
-rw-r--r--cairomm/Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f99d9db..d0f1dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
2008-03-10 Jonathon Jongsma <jjongsma@gnome.org>
+ * cairomm/Makefile.am: install the new cairommconfig.h header and make sure
+ that the .in file is distributed
+
+2008-03-10 Jonathon Jongsma <jjongsma@gnome.org>
+
* cairomm/exception.cc: include <string> to fix the build on solaris which
apparently doesn't include string from their exception header (Tim Mooney).
Fixes bug #14559
diff --git a/cairomm/Makefile.am b/cairomm/Makefile.am
index d4de9bd..ad2b535 100644
--- a/cairomm/Makefile.am
+++ b/cairomm/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS =
INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@
-h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h
+h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h cairommconfig.h
h_sources_private = private.h
cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc
cc_sources_private = private.cc
@@ -22,3 +22,5 @@ libcairomm_1_0_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_privat
# Install the headers:
library_includedir=$(includedir)/cairomm-1.0/cairomm
library_include_HEADERS = $(h_sources_public)
+
+EXTRA_DIST = cairommconfig.h.in