Newer
Older
--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:32:59.372000000 +0000
+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:31:13.230000000 +0000
@@ -12,34 +12,40 @@
-DG_LOG_DOMAIN=\"Foocanvas\" \
-DVERSION=\"$(VERSION)\"
-lib_LTLIBRARIES = libfoocanvas.la
+lib_LTLIBRARIES = libzmapfoocanvas.la
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
-libfoocanvas_la_LIBADD = \
+libzmapfoocanvas_la_LIBADD = \
$(RENDER_LIBS) \
$(LIBFOOCANVAS_LIBS)
-libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
+libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
libfoocanvasinclude_HEADERS = \
foo-canvas-line.h \
+ foozmap-canvas-line-glyph.h \
foo-canvas-pixbuf.h \
foo-canvas-polygon.h \
foo-canvas-rect-ellipse.h \
foo-canvas-text.h \
+ foozmap-canvas-text.h \
+ foozmap-canvas-floating-group.h \
foo-canvas-util.h \
foo-canvas-widget.h \
foo-canvas.h \
libfoocanvas.h
-libfoocanvas_la_SOURCES = \
+libzmapfoocanvas_la_SOURCES = \
$(libfoocanvasinclude_HEADERS) \
foo-canvas-marshal.list \
foo-canvas-i18n.h \
foo-canvas-line.c \
+ foozmap-canvas-line-glyph.c \
foo-canvas-pixbuf.c \
foo-canvas-polygon.c \
foo-canvas-rect-ellipse.c \
foo-canvas-text.c \
+ foozmap-canvas-text.c \
+ foozmap-canvas-floating-group.c \
foo-canvas-util.c \
foo-canvas-widget.c \
foo-canvas.c \
@@ -67,4 +73,4 @@
EXTRA_DIST = libzmapfoocanvas.pc.in
-pkgconfig_DATA = libfoocanvas.pc
+pkgconfig_DATA = libzmapfoocanvas.pc