From 1e8019c00c513f057ab9774de8581bf4cb564d3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 31 Jan 2014 21:56:21 -0800 Subject: [PATCH] build: Drop use of rsvg-convert Just include the png in the repo. --- configure.ac | 3 --- data/.gitignore | 1 - data/Makefile.am | 9 +-------- data/wayland.png | Bin 0 -> 6023 bytes 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 data/.gitignore create mode 100644 data/wayland.png diff --git a/configure.ac b/configure.ac index cce1850..3f47edd 100644 --- 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 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 --- 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 index 0000000000000000000000000000000000000000..1b7363e0b395808fead0b422e1de9ffce1a2aebd GIT binary patch literal 6023 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 Bc1!>O literal 0 HcmV?d00001 -- 2.7.4