Install header files for libgnomecanvas and libart_lpgl.

2 files changed, 79 insertions, 76 deletions

diff --git a/libart_lgpl/Makefile.am b/libart_lgpl/Makefile.am
index 94aef9278f..bc45e33137 100644
--- a/libart_lgpl/Makefile.am
+++ b/libart_lgpl/Makefile.am
@@ -1,103 +1,102 @@
-privsolib_LTLIBRARIES = libart_lgpl.la
+libart_lgplincludedir = $(privincludedir)/libart_lgpl
 
-if OS_WIN32
-else
-libm = -lm
-endif
+privsolib_LTLIBRARIES = libart_lgpl.la
 
 libart_lgpl_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
 	$(GNOME_PLATFORM_CFLAGS)
 
-libart_lgpl_la_SOURCES = \
-	art_affine.c \
+libart_lgplinclude_HEADERS = \
 	art_affine.h \
-	art_alphagamma.c \
 	art_alphagamma.h \
-	art_bpath.c \
 	art_bpath.h \
 	art_filterlevel.h \
-	art_gray_svp.c \
 	art_gray_svp.h \
-	art_misc.c \
 	art_misc.h \
 	art_pathcode.h \
-	art_pixbuf.c \
 	art_pixbuf.h \
 	art_point.h \
-	art_rect.c \
 	art_rect.h \
-	art_rect_svp.c \
 	art_rect_svp.h \
-	art_rect_uta.c \
 	art_rect_uta.h \
-	art_render.c \
 	art_render.h \
-	art_render_gradient.c \
 	art_render_gradient.h \
-	art_render_mask.c \
 	art_render_mask.h \
-	art_render_svp.c \
 	art_render_svp.h \
-	art_rgb.c \
 	art_rgb.h \
-	art_rgb_a_affine.c \
 	art_rgb_a_affine.h \
-	art_rgb_affine.c \
 	art_rgb_affine.h \
-	art_rgb_affine_private.c \
 	art_rgb_affine_private.h \
-	art_rgb_bitmap_affine.c \
 	art_rgb_bitmap_affine.h \
-	art_rgb_pixbuf_affine.c \
 	art_rgb_pixbuf_affine.h \
-	art_rgb_rgba_affine.c \
 	art_rgb_rgba_affine.h \
-	art_rgb_svp.c \
 	art_rgb_svp.h \
-	art_rgba.c \
 	art_rgba.h \
-	art_svp.c \
 	art_svp.h \
-	art_svp_intersect.c \
 	art_svp_intersect.h \
-	art_svp_ops.c \
 	art_svp_ops.h \
-	art_svp_point.c \
 	art_svp_point.h \
-	art_svp_render_aa.c \
 	art_svp_render_aa.h \
-	art_svp_vpath.c \
 	art_svp_vpath.h \
-	art_svp_vpath_stroke.c \
 	art_svp_vpath_stroke.h \
-	art_svp_wind.c \
 	art_svp_wind.h \
-	art_uta.c \
 	art_uta.h \
-	art_uta_ops.c \
 	art_uta_ops.h \
-	art_uta_rect.c \
 	art_uta_rect.h \
-	art_uta_svp.c \
 	art_uta_svp.h \
-	art_uta_vpath.c \
 	art_uta_vpath.h \
-	art_vpath.c \
 	art_vpath.h \
-	art_vpath_bpath.c \
 	art_vpath_bpath.h \
-	art_vpath_dash.c \
 	art_vpath_dash.h \
-	art_vpath_svp.c \
 	art_vpath_svp.h \
 	libart.h
 
-libart_lgpl_la_LDFLAGS = $(NO_UNDEFINED)
+libart_lgpl_la_SOURCES = \
+	art_affine.c \
+	art_alphagamma.c \
+	art_bpath.c \
+	art_gray_svp.c \
+	art_misc.c \
+	art_pixbuf.c \
+	art_rect.c \
+	art_rect_svp.c \
+	art_rect_uta.c \
+	art_render.c \
+	art_render_gradient.c \
+	art_render_mask.c \
+	art_render_svp.c \
+	art_rgb.c \
+	art_rgb_a_affine.c \
+	art_rgb_affine.c \
+	art_rgb_affine_private.c \
+	art_rgb_bitmap_affine.c \
+	art_rgb_pixbuf_affine.c \
+	art_rgb_rgba_affine.c \
+	art_rgb_svp.c \
+	art_rgba.c \
+	art_svp.c \
+	art_svp_intersect.c \
+	art_svp_ops.c \
+	art_svp_point.c \
+	art_svp_render_aa.c \
+	art_svp_vpath.c \
+	art_svp_vpath_stroke.c \
+	art_svp_wind.c \
+	art_uta.c \
+	art_uta_ops.c \
+	art_uta_rect.c \
+	art_uta_svp.c \
+	art_uta_vpath.c \
+	art_vpath.c \
+	art_vpath_bpath.c \
+	art_vpath_dash.c \
+	art_vpath_svp.c
 
 libart_lgpl_la_LIBADD = \
 	$(GNOME_PLATFORM_LIBS) \
-	$(libm)
+	$(MATH_LIB)
+
+libart_lgpl_la_LDFLAGS = $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index 26de2c6455..b1e56371ff 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -1,3 +1,5 @@
+libgnomecanvasincludedir = $(privincludedir)/libgnomecanvas
+
 privsolib_LTLIBRARIES = libgnomecanvas.la
 
 libgnomecanvas_la_CPPFLAGS = \
@@ -11,60 +13,56 @@ libgnomecanvas_la_CPPFLAGS = \
 	-DGNOMECANVASLOCALSTATEDIR=\""$(localstatedir)"\" 	\
 	-DG_LOG_DOMAIN=\"GnomeCanvas\"
 
-libgnomecanvas_la_LIBADD = \
-	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
-	$(GNOME_PLATFORM_LIBS)
-
-libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
+libgnomecanvasinclude_HEADERS =			\
+	gailcanvas.h				\
+	gailcanvasgroup.h			\
+	gailcanvasgroupfactory.h		\
+	gailcanvasitem.h			\
+	gailcanvasitemfactory.h			\
+	gailcanvastext.h			\
+	gailcanvastextfactory.h			\
+	gailcanvaswidget.h			\
+	gailcanvaswidgetfactory.h		\
+	gnome-canvas-bpath.h			\
+	gnome-canvas-clipgroup.h		\
+	gnome-canvas-i18n.h			\
+	gnome-canvas-line.h			\
+	gnome-canvas-path-def.h			\
+	gnome-canvas-pixbuf.h			\
+	gnome-canvas-polygon.h			\
+	gnome-canvas-rect-ellipse.h		\
+	gnome-canvas-rich-text.h		\
+	gnome-canvas-shape.h			\
+	gnome-canvas-text.h			\
+	gnome-canvas-util.h			\
+	gnome-canvas-widget.h			\
+	gnome-canvas.h				\
+	libgnomecanvas.h
 
 libgnomecanvas_la_SOURCES =			\
 	gailcanvas.c				\
-	gailcanvas.h				\
 	gailcanvasgroup.c			\
-	gailcanvasgroup.h			\
 	gailcanvasgroupfactory.c		\
-	gailcanvasgroupfactory.h		\
 	gailcanvasitem.c			\
-	gailcanvasitem.h			\
 	gailcanvasitemfactory.c			\
-	gailcanvasitemfactory.h			\
 	gailcanvastext.c			\
-	gailcanvastext.h			\
 	gailcanvastextfactory.c			\
-	gailcanvastextfactory.h			\
 	gailcanvaswidget.c			\
-	gailcanvaswidget.h			\
 	gailcanvaswidgetfactory.c		\
-	gailcanvaswidgetfactory.h		\
 	gnome-canvas-bpath.c			\
-	gnome-canvas-bpath.h			\
 	gnome-canvas-clipgroup.c		\
-	gnome-canvas-clipgroup.h		\
-	gnome-canvas-i18n.h			\
 	gnome-canvas-line.c			\
-	gnome-canvas-line.h			\
 	gnome-canvas-path-def.c			\
-	gnome-canvas-path-def.h			\
 	gnome-canvas-pixbuf.c			\
-	gnome-canvas-pixbuf.h			\
 	gnome-canvas-polygon.c			\
-	gnome-canvas-polygon.h			\
 	gnome-canvas-rect-ellipse.c		\
-	gnome-canvas-rect-ellipse.h		\
 	gnome-canvas-rich-text.c		\
-	gnome-canvas-rich-text.h		\
 	gnome-canvas-shape-private.h		\
 	gnome-canvas-shape.c			\
-	gnome-canvas-shape.h			\
 	gnome-canvas-text.c			\
-	gnome-canvas-text.h			\
 	gnome-canvas-util.c			\
-	gnome-canvas-util.h			\
 	gnome-canvas-widget.c			\
-	gnome-canvas-widget.h			\
 	gnome-canvas.c				\
-	gnome-canvas.h				\
-	libgnomecanvas.h			\
 	libgnomecanvastypes.c
 
 MARSHAL_GENERATED =				\
@@ -73,6 +71,12 @@ MARSHAL_GENERATED =				\
 
 @EVO_MARSHAL_RULE@
 
+libgnomecanvas_la_LIBADD = \
+	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
+	$(GNOME_PLATFORM_LIBS)
+
+libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
+
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 
 CLEANFILES = $(BUILT_SOURCES)