now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 200abe1cfa369c5ea325a032e4cd8aa5ad1e545c..44b885ab0e428bd2ba4d45819c462cbcfc637a4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,12 @@ inkjar_dir = inkjar
 inkjar_libs = inkjar/libinkjar.a
 endif
 
+# Extra files to remove when doing "make distclean"
+DISTCLEANFILES =       \
+       helper/sp-marshal.cpp   \
+       helper/sp-marshal.h     \
+       inkscape-version.cpp
+
 inkscape_private_libs =        \
        libinkpre.a             \
        application/libinkapp.a \
@@ -93,7 +99,8 @@ inkscape_private_libs =       \
        io/libio.a              \
        $(inkjar_libs)          \
        libinkpost.a            \
-       debug/libinkdebug.a
+       debug/libinkdebug.a     \
+       libinkversion.a
 
 all_libs =                     \
        $(inkscape_private_libs)        \
@@ -140,7 +147,6 @@ include libcola/Makefile_insert
 include removeoverlap/Makefile_insert
 include graphlayout/Makefile_insert
 include svg/Makefile_insert
-include utest/Makefile_insert
 include widgets/Makefile_insert
 include debug/Makefile_insert
 include xml/Makefile_insert
@@ -162,12 +168,6 @@ bin_PROGRAMS = inkscape inkview
 # Currently we use one library per source directory.
 noinst_LIBRARIES = $(inkscape_private_libs)
 
-# Extra files to remove when doing "make distclean"
-DISTCLEANFILES =       \
-       helper/sp-marshal.cpp   \
-       helper/sp-marshal.h     \
-       inkscape_version.h
-
 # Extra files not mentioned as sources to include in the source tarball
 EXTRA_DIST =   \
        $(top_srcdir)/Doxyfile  \
@@ -203,7 +203,6 @@ EXTRA_DIST =        \
        svg/makefile.in         \
        trace/makefile.in       \
        traits/makefile.in      \
-       utest/makefile.in       \
        ui/makefile.in          \
        ui/cache/makefile.in    \
        ui/dialog/makefile.in   \
@@ -220,8 +219,6 @@ EXTRA_DIST =        \
        extension/internal/emf-win32-print.cpp  \
        extension/internal/emf-win32-print.h    \
        helper/sp-marshal.list  \
-       utest/utest.h   \
-       utest/test-1ary-cases.h \
        traits/copy.h   \
        traits/function.h       \
        traits/list-copy.h      \
@@ -242,9 +239,8 @@ EXTRA_PROGRAMS =    \
 # need to be built. There should be one test program per directory.
 # automake adds $(EXEEXT) to check_PROGRAMS items but not to TESTS items:
 # TESTS items can be scripts etc.
-check_PROGRAMS =       \
-       cxxtests        \
-       style-test
+check_PROGRAMS = cxxtests
+
 # streamtest is unfinished and can't handle the relocations done during
 # "make distcheck".