convert NR to Geom

[inkscape.git] / src / xml / Makefile_insert

diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert
index 69f8952a9572faa5fc4bd6d95e8ccc81c9d78d27..3321031c90ec4777f0807fdf54db6e03def4ae88 100644 (file)
--- a/src/xml/Makefile_insert
+++ b/src/xml/Makefile_insert
@@ -18,6 +18,8 @@ xml_libspxml_a_SOURCES =      \
        xml/comment-node.h \
        xml/composite-node-observer.cpp xml/composite-node-observer.h \
        xml/element-node.h \
+       xml/helper-observer.cpp \
+       xml/helper-observer.h   \
        xml/node-observer.h \
        xml/quote.cpp   \
        xml/quote.h     \
@@ -26,6 +28,7 @@ xml_libspxml_a_SOURCES =      \
        xml/log-builder.h       \
        xml/node-fns.cpp        \
        xml/node-fns.h  \
+       xml/pi-node.h   \
        xml/repr-io.cpp \
        xml/repr-sorting.cpp    \
        xml/repr-sorting.h      \
@@ -46,45 +49,32 @@ xml_libspxml_a_SOURCES =    \
        xml/node-event-vector.h \
        xml/node-iterators.h    \
        xml/sp-css-attr.h \
+       xml/subtree.cpp \
+       xml/subtree.h   \
        xml/text-node.h \
-       xml/invalid-operation-exception.h
+       xml/invalid-operation-exception.h \
+       xml/xml-forward.h
 
-xml/test-xml-main.cpp: xml/test-xml.cpp $(xml_test_xml_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o xml/test-xml-main.cpp $(xml_test_xml_includes)
-
-xml/test-xml.cpp: $(xml_test_xml_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o xml/test-xml.cpp $(xml_test_xml_includes)
-
-xml_test_xml_includes = \
+# ######################
+# ### CxxTest stuff ####
+# ######################
+xml_testsuites = \
        $(srcdir)/xml/repr-action-test.h        \
        $(srcdir)/xml/quote-test.h
 
-xml_libtest_xml_a_SOURCES =    \
-       xml/test-xml.cpp \
-       $(xml_test_xml_includes)
-
 xml_test_xml_SOURCES = \
-       xml/test-xml-main.cpp \
-       $(xml_test_xml_includes)
+       xml/test-xml.cpp \
+       $(xml_testsuites)
 
 xml_test_xml_LDADD =   \
-       xml/libtest-xml.a       \
-       xml/libspxml.a  \
-       util/libinkutil.a       \
-       svg/libtest-stubs.a     \
-       $(INKSCAPE_LIBS)
-
-
-xml_repr_action_test_SOURCES = \
-       xml/repr-action-test.cpp
-xml_repr_action_test_LDADD = \
-       xml/libspxml.a  \
-       svg/libspsvg.a  \
-       svg/libtest-stubs.a     \
+       xml/libspxml.a          \
        util/libinkutil.a       \
-       libinkpost.a    \
+       svg/libspsvg.a          \
+       helper/libspchelp.a     \
+       test-stubs.o            \
+       libinkpost.a            \
        debug/libinkdebug.a     \
        $(INKSCAPE_LIBS)
 
-xml_quote_test_SOURCES = xml/quote-test.cpp
-xml_quote_test_LDADD = $(INKSCAPE_LIBS)
+xml/test-xml.cpp: $(xml_testsuites) xml/Makefile_insert $(CXXTEST_TEMPLATE)
+       $(CXXTESTGEN) -o xml/test-xml.cpp $(xml_testsuites)