build: Drop use of rsvg-convert

Just include the png in the repo.

diff --git a/configure.ac b/configure.ac
index cce1850..3f47edd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -417,9 +417,6 @@ if test x$enable_wcap_tools = xyes; then
   WCAP_LIBS="$WCAP_LIBS -lm"
 fi
 
-AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
-AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
-
 PKG_CHECK_MODULES(SETBACKLIGHT, [libudev libdrm], enable_setbacklight=yes, enable_setbacklight=no)
 AM_CONDITIONAL(BUILD_SETBACKLIGHT, test "x$enable_setbacklight" = "xyes")
 

diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644 (file)
index 8ea50a6..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wayland.png

diff --git a/data/Makefile.am b/data/Makefile.am
index a7cc944..84a2a53 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ westondatadir = $(datadir)/weston
 
 dist_westondata_DATA =                         \
        wayland.svg                             \
-       $(wayland_icon_png)                     \
+       wayland.png                             \
        pattern.png                             \
        terminal.png                            \
        border.png                              \
@@ -10,10 +10,3 @@ dist_westondata_DATA =                               \
        sign_close.png                          \
        sign_maximize.png                       \
        sign_minimize.png
-
-if HAVE_RSVG_CONVERT
-wayland_icon_png = wayland.png
-
-wayland.png : $(top_srcdir)/data/wayland.svg
-       $(RSVG_CONVERT) -w 128 -h 128 $< -o $@
-endif

diff --git a/data/wayland.png b/data/wayland.png
new file mode 100644 (file)
index 0000000..1b7363e
Binary files /dev/null and b/data/wayland.png differ