summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorVinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>2013-09-12 10:23:11 +0000
committerVinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>2013-09-12 10:23:11 +0000
commitdd18c27c36c9138bc68161ad365bfc61b8d135f8 (patch)
tree628e0db10c28eab68710d87d180f0eccf695522e /src/Makefile.am
parentpartially revert 12471, this fixes bug 1215575, but undoes the fix for the le... (diff)
downloadinkscape-dd18c27c36c9138bc68161ad365bfc61b8d135f8.tar.gz
inkscape-dd18c27c36c9138bc68161ad365bfc61b8d135f8.zip
Integrating with libdepixelize
(bzr r12506.1.1)
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 77ba1f567..9cc7478be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,17 +23,18 @@ endif
noinst_LIBRARIES = \
- libinkscape.a \
- dom/libdom.a \
- libcroco/libcroco.a \
- libavoid/libavoid.a \
- $(internal_GDL) \
- libuemf/libuemf.a \
- libcola/libcola.a \
- libvpsc/libvpsc.a \
- livarot/libvarot.a \
- 2geom/lib2geom.a \
- libinkversion.a
+ libinkscape.a \
+ dom/libdom.a \
+ libcroco/libcroco.a \
+ libavoid/libavoid.a \
+ $(internal_GDL) \
+ libuemf/libuemf.a \
+ libcola/libcola.a \
+ libvpsc/libvpsc.a \
+ livarot/libvarot.a \
+ 2geom/lib2geom.a \
+ libinkversion.a \
+ libdepixelize/libdepixelize.a
all_libs = \
$(noinst_LIBRARIES) \
@@ -139,6 +140,7 @@ include ui/widget/Makefile_insert
include util/Makefile_insert
include trace/Makefile_insert
include 2geom/Makefile_insert
+include libdepixelize/Makefile_insert
# Extra files not mentioned as sources to include in the source tarball
EXTRA_DIST += \
@@ -184,6 +186,7 @@ EXTRA_DIST += \
show-preview.bmp \
sp-skeleton.cpp sp-skeleton.h \
winconsole.cpp \
+ libdepixelize/makefile.in \
$(CXXTEST_TEMPLATE)
# Extra files to remove when doing "make distclean"