summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-12-08 11:05:08 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-12-08 11:05:08 +0000
commitd79bd642b3214f1c44d7c1268e8adcb7bd55fffc (patch)
tree74a8529da5f23996ba4b358c045a7588f8c27f24 /src/Makefile.am
parentminor changes (diff)
parentmerge lp:~inkscape.dev/inkscape/lock_guides (diff)
downloadinkscape-d79bd642b3214f1c44d7c1268e8adcb7bd55fffc.tar.gz
inkscape-d79bd642b3214f1c44d7c1268e8adcb7bd55fffc.zip
update to trunk
(bzr r14272.1.11)
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a37f13e8..27d4fb844 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,6 @@ all_libs = \
$(FREETYPE_LIBS) \
$(kdeldadd) \
$(win32ldflags) \
- $(CARBON_LDFLAGS) \
$(LIBWPG_LIBS) \
$(LIBVISIO_LIBS) \
$(LIBCDR_LIBS) \
@@ -260,9 +259,7 @@ check-local:
# the XFAIL_TESTS build target should be removed.
# See the following Launchpad bugs:
#
-# LP #1202271 <cxxtest: preferences-test.h fails>
# LP #1208013 <cxxtest: curve-test.h fails>
-# LP #1208002 <cxxtest: svg-length-test.h fails>
# LP #1208005 <cxxtest: svg-path-geom-test.h fails>
# LP #1207502 <cxxtest: svg-affine-test.h fails>