Use subdirectories with icon sizes.

[inkscape.git] / src / libnr / Makefile_insert

diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index ef813a8be8b3607612de3206c07925e8618d89c5..8dd3c46e32d3d5af59e08ee53a3077641d15a724 100644 (file)
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -1,25 +1,12 @@
 ## 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/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 \
@@ -93,69 +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 --template=$(srcdir)/selfname.tpl -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 --have-eh -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
+#libnr_testnr_LDADD =  \
+#      libnr/libnr.a   \
+#      -lglib-2.0
 
-libnr_test_nr_includes = \
+# ######################
+# ### CxxTest stuff ####
+# ######################
+CXXTEST_TESTSUITES += \
+       $(srcdir)/libnr/in-svg-plane-test.h     \
        $(srcdir)/libnr/nr-compose-test.h       \
-       $(srcdir)/libnr/nr-types-test.h \
-       $(srcdir)/libnr/nr-translate-test.h     \
-       $(srcdir)/libnr/nr-rotate-test.h        \
-       $(srcdir)/libnr/nr-scale-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/nr-compose-reference.cpp \
-       libnr/nr-compose-reference.h \
-       $(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