Use subdirectories with icon sizes.

[inkscape.git] / src / libnr / Makefile_insert

diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 541432193a7826a76bd86be36701fd89eee927d8..8dd3c46e32d3d5af59e08ee53a3077641d15a724 100644 (file)
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -1,28 +1,15 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-libnr/all: libnr/libnr.a
-
-libnr/clean:
-       rm -f libnr/libnr.a libnr/libtest-nr.a $(libnr_libnr_a_OBJECTS) $(libnr_libtest_nr_a_OBJECTS)
-
-if USE_MMX
-libnr_mmx_sources =    \
-       libnr/have_mmx.S        \
-       libnr/nr_mmx_R8G8B8A8_P_EMPTY_A8_RGBAP.S        \
-       libnr/nr_mmx_R8G8B8A8_P_R8G8B8A8_P_A8_RGBAP.S   \
-       libnr/nr_mmx_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM.S       \
-       libnr/nr_mmx_R8G8B8_R8G8B8_R8G8B8A8_P.S
-endif
-
-libnr_libnr_a_SOURCES =        \
+ink_common_sources +=  \
        libnr/in-svg-plane.h    \
-       libnr/n-art-bpath.h     \
        libnr/nr-blit.cpp       \
        libnr/nr-blit.h \
        libnr/nr-compose-transform.cpp  \
        libnr/nr-compose-transform.h    \
+       libnr/nr-compose-reference.h    \
        libnr/nr-compose.cpp    \
        libnr/nr-compose.h      \
+       libnr/nr-convert2geom.h \
        libnr/nr-convex-hull.h  \
        libnr/nr-coord.h        \
        libnr/nr-dim2.h \
@@ -38,17 +25,13 @@ libnr_libnr_a_SOURCES =     \
        libnr/nr-matrix-ops.h   \
        libnr/nr-matrix-rotate-ops.cpp  \
        libnr/nr-matrix-rotate-ops.h    \
-       libnr/nr-matrix-scale-ops.cpp   \
        libnr/nr-matrix-scale-ops.h     \
-       libnr/nr-matrix-translate-ops.cpp       \
        libnr/nr-matrix-translate-ops.h \
        libnr/nr-matrix.cpp     \
        libnr/nr-matrix.h       \
        libnr/nr-maybe.h        \
        libnr/nr-object.cpp     \
        libnr/nr-object.h       \
-       libnr/nr-path.cpp       \
-       libnr/nr-path.h \
        libnr/nr-path-code.h    \
        libnr/nr-pixblock-line.cpp      \
        libnr/nr-pixblock-line.h        \
@@ -83,11 +66,6 @@ libnr_libnr_a_SOURCES =      \
        libnr/nr-scale-translate-ops.h  \
        libnr/nr-scale-ops.h    \
        libnr/nr-scale.h        \
-       libnr/nr-svp-private.h  \
-       libnr/nr-svp-render.cpp \
-       libnr/nr-svp-render.h   \
-       libnr/nr-svp.cpp        \
-       libnr/nr-svp.h  \
        libnr/nr-translate-matrix-ops.cpp       \
        libnr/nr-translate-matrix-ops.h \
        libnr/nr-translate-scale-ops.cpp        \
@@ -102,66 +80,25 @@ libnr_libnr_a_SOURCES =    \
        libnr/nr-values.h       \
        $(libnr_mmx_sources)
 
-libnr_testnr_SOURCES = \
-       libnr/testnr.cpp
-
-libnr_testnr_LDADD =   \
-       libnr/libnr.a   \
-       -lglib-2.0
-
-
-libnr/test-nr-main.cpp: libnr/test-nr.cpp
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --error-printer -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
+# Ancient performance test (?)
+# Won't work anymore.
+#libnr_testnr_SOURCES =        \
+#      libnr/testnr.cpp
 
-libnr/test-nr.cpp: $(libnr_test_nr_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
+#libnr_testnr_LDADD =  \
+#      libnr/libnr.a   \
+#      -lglib-2.0
 
-libnr_test_nr_includes = \
-       $(srcdir)/libnr/nr-types-test.h \
-       $(srcdir)/libnr/nr-translate-test.h     \
-       $(srcdir)/libnr/nr-rotate-test.h        \
-       $(srcdir)/libnr/nr-scale-test.h \
+# ######################
+# ### CxxTest stuff ####
+# ######################
+CXXTEST_TESTSUITES += \
+       $(srcdir)/libnr/in-svg-plane-test.h     \
+       $(srcdir)/libnr/nr-compose-test.h       \
+       $(srcdir)/libnr/nr-matrix-test.h        \
        $(srcdir)/libnr/nr-point-fns-test.h     \
+       $(srcdir)/libnr/nr-rotate-test.h        \
        $(srcdir)/libnr/nr-rotate-fns-test.h    \
-       $(srcdir)/libnr/in-svg-plane-test.h     \
-       $(srcdir)/libnr/nr-matrix-test.h
-
-libnr_libtest_nr_a_SOURCES =   \
-       libnr/test-nr.cpp \
-       $(libnr_test_nr_includes)
-
-libnr_test_nr_SOURCES =        \
-       libnr/test-nr-main.cpp \
-       $(libnr_test_nr_includes)
-
-libnr_test_nr_LDADD =  \
-       libnr/libnr.a   \
-       libnr/libtest-nr.a      \
-       -lglib-2.0
-
-#      -L/usr/X11R6/lib
-#      -lX11
-
-libnr_in_svg_plane_test_SOURCES = libnr/in-svg-plane-test.cpp
-libnr_in_svg_plane_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_types_test_SOURCES = libnr/nr-types-test.cpp
-libnr_nr_types_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_point_fns_test_SOURCES = libnr/nr-point-fns-test.cpp
-libnr_nr_point_fns_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_matrix_test_SOURCES = libnr/nr-matrix-test.cpp
-libnr_nr_matrix_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_rotate_test_SOURCES = libnr/nr-rotate-test.cpp
-libnr_nr_rotate_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_rotate_fns_test_SOURCES = libnr/nr-rotate-fns-test.cpp
-libnr_nr_rotate_fns_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_scale_test_SOURCES = libnr/nr-scale-test.cpp
-libnr_nr_scale_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_translate_test_SOURCES = libnr/nr-translate-test.cpp
-libnr_nr_translate_test_LDADD = libnr/libnr.a -lglib-2.0
+       $(srcdir)/libnr/nr-scale-test.h         \
+       $(srcdir)/libnr/nr-translate-test.h     \
+       $(srcdir)/libnr/nr-types-test.h