Filters. Custom predefined filters update and new ABC filters.

[inkscape.git] / src / util / Makefile_insert

diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index e4a89d046212c8070c0773bd190aac6d20d6e85e..deff951d44f4f06bdf2d39ecb43c3861360a36d7 100644 (file)
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -1,51 +1,41 @@
+## Makefile.am fragment sourced by src/Makefile.am.
 
-util/all: util/libinkutil.a
-
-util/clean:
-       rm -f util/libinkutil.a $(util_libinkutil_a_OBJECTS)
-
-util_libinkutil_a_SOURCES = \
+ink_common_sources += \
+       util/accumulators.h     \
        util/compose.hpp        \
-       util/ucompose.hpp       \
+       util/copy.h \
        util/enums.h \
+       util/ege-appear-time-tracker.cpp        \
+       util/ege-appear-time-tracker.h  \
+       util/ege-tags.h \
+       util/ege-tags.cpp \
        util/filter-list.h \
+       util/find-if-before.h \
+       util/find-last-if.h \
        util/fixed_point.h \
        util/format.h   \
        util/forward-pointer-iterator.h \
+       util/function.h \
        util/glib-list-iterators.h \
        util/list.h \
        util/list-container.h \
+       util/list-copy.h \
+       util/longest-common-suffix.h \
        util/map-list.h \
        util/mathfns.h \
+       util/reference.h \
        util/reverse-list.h \
        util/share.h \
        util/share.cpp \
        util/tuple.h \
+       util/ucompose.hpp \
        util/units.cpp \
-       util/units.h
-
-util_list_container_test_SOURCES = util/list-container-test.cpp
-util_list_container_test_LDADD = gc.o $(INKSCAPE_LIBS)
-
-# Copy/paste from libnr
-util/test-util-main.cpp: util/test-util.cpp
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o util/test-util-main.cpp $(util_test_util_includes)
+       util/units.h \
+       util/unordered-containers.h
 
-util/test-util.cpp: $(util_test_util_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o util/test-util.cpp $(util_test_util_includes)
+# ######################
+# ### CxxTest stuff ####
+# ######################
 
-util_test_util_includes = \
+CXXTEST_TESTSUITES += \
        $(srcdir)/util/list-container-test.h
-
-util_libtest_util_a_SOURCES = \
-       util/test-util.cpp \
-       $(util_test_util_includes)
-
-util_test_util_SOURCES = \
-       util/test-util-main.cpp \
-       $(util_test_util_includes)
-
-util_test_util_LDADD = \
-       util/libtest-util.a \
-       gc.o $(INKSCAPE_LIBS)
-