X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=0f8cd9e4b796807f63916cd85ab690f973dd86f1;hb=c6172c4f6cb97ec651af9a89ea5b55e6cbc24ebd;hp=cda0a04fd521d7bf9acb75b126d8703c4da735c6;hpb=b07c5597b54104b95177aff2542679844bc16b37;p=inkscape.git

diff --git a/src/Makefile.am b/src/Makefile.am
index cda0a04fd..0f8cd9e4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,7 @@ INCLUDES =	\
 	$(GNOME_VFS_CFLAGS)	\
 	$(INKBOARD_CFLAGS) \
 	$(XFT_CFLAGS)	\
+	$(GTK_UNIX_PRINT_CFLAGS)	\
 	-DPOTRACE=\"potrace\"	\
 	$(INKSCAPE_CFLAGS) \
 	-I$(top_srcdir)/cxxtest
@@ -56,6 +57,7 @@ include xml/Makefile_insert
 include traits/Makefile_insert
 include algorithms/Makefile_insert
 include ui/Makefile_insert
+include ui/cache/Makefile_insert
 include ui/dialog/Makefile_insert
 include ui/view/Makefile_insert
 include ui/widget/Makefile_insert
@@ -81,6 +83,7 @@ noinst_LIBRARIES =	\
 	io/libio.a	\
 	libcroco/libcroco.a	\
 	ui/libui.a	\
+	ui/cache/libuicache.a	\
 	ui/dialog/libuidialog.a	\
 	ui/view/libuiview.a 	\
 	ui/widget/libuiwidget.a	\
@@ -113,9 +116,6 @@ DISTCLEANFILES =	\
 	inkscape_version.h
 
 EXTRA_DIST =	\
-	mkdep.pl	\
-	mkfiles.pl	\
-	make.exclude	\
 	Doxyfile	\
 	sp-skeleton.cpp sp-skeleton.h	\
 	algorithms/makefile.in	\
@@ -147,6 +147,7 @@ EXTRA_DIST =	\
 	traits/makefile.in	\
 	utest/makefile.in	\
 	ui/makefile.in		\
+	ui/cache/makefile.in	\
 	ui/dialog/makefile.in	\
 	ui/view/makefile.in	\
 	ui/widget/makefile.in	\
@@ -194,11 +195,10 @@ TESTS =	\
 	xml/quote-test$(EXEEXT)	\
 	xml/repr-action-test$(EXEEXT)
 
-# Amd64 failures??
-#XFAIL_TESTS = \
-#	test-all$(EXEEXT)	\
-#	style-test$(EXEEXT)	\
-#	svg/test-svg$(EXEEXT)
+# As of 2007-01-13, these are failing...
+XFAIL_TESTS = \
+	test-all$(EXEEXT)	\
+	style-test$(EXEEXT)
 
 # streamtest is unfinished and can't handle the relocations done during
 # "make distcheck".  Not needed for the 0.41 release.