From 6548cfaabbbb65b26ab803c356b1a264ad5e2705 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 21 Jul 2003 00:24:14 +0000 Subject: [PATCH] handy conf script SVN revision: 7201 --- legacy/edje/Makefile.am | 2 +- legacy/edje/conf-e-x11.sh | 6 ++++++ legacy/edje/edje.spec | 5 ++++- legacy/evas/Makefile.am | 2 +- legacy/evas/conf-e-x11.sh | 35 +++++++++++++++++++++++++++++++++++ legacy/evas/configure.in | 2 +- legacy/evas/evas.spec | 8 +++++--- 7 files changed, 53 insertions(+), 7 deletions(-) create mode 100755 legacy/edje/conf-e-x11.sh create mode 100755 legacy/evas/conf-e-x11.sh diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am index 4f881175aa..cab40badec 100644 --- a/legacy/edje/Makefile.am +++ b/legacy/edje/Makefile.am @@ -33,5 +33,5 @@ dist-hook: bin_SCRIPTS = edje-config EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN edje.spec edje.c.in gendoc Doxyfile edje_docs.tar.gz \ -make_cross_compile_arm.sh +make_cross_compile_arm.sh conf-e-x11.sh diff --git a/legacy/edje/conf-e-x11.sh b/legacy/edje/conf-e-x11.sh new file mode 100755 index 0000000000..bf2dee52fa --- /dev/null +++ b/legacy/edje/conf-e-x11.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +cmake clean distclean +rm config.cache +./configure \ +$@ diff --git a/legacy/edje/edje.spec b/legacy/edje/edje.spec index 400ae903c8..72e9c2a7fc 100644 --- a/legacy/edje/edje.spec +++ b/legacy/edje/edje.spec @@ -64,10 +64,13 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %attr(755,root,root) %{prefix}/lib/libedje.so* %attr(755,root,root) %{prefix}/lib/libedje.la +%attr(755,root,root) %{prefix}/bin/edje +%attr(755,root,root) %{prefix}/bin/edje_cc +%attr(755,root,root) %{prefix}/share/edje %files devel %attr(755,root,root) %{prefix}/lib/libedje.a -%attr(755,root,root) %{prefix}/bin/edje* +%attr(755,root,root) %{prefix}/bin/edje-config %{prefix}/include/Edje* %doc AUTHORS %doc COPYING diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am index 1c256b3895..75f89981b0 100644 --- a/legacy/evas/Makefile.am +++ b/legacy/evas/Makefile.am @@ -31,7 +31,7 @@ dist-hook: bin_SCRIPTS = evas-config EXTRA_DIST = TODO README AUTHORS COPYING COPYING-PLAIN evas.spec evas.c.in gendoc Doxyfile evas_docs.tar.gz evas.pc.in \ -make_cross_compile_arm.sh +make_cross_compile_arm.sh conf-e-x11.sh pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = evas.pc diff --git a/legacy/evas/conf-e-x11.sh b/legacy/evas/conf-e-x11.sh new file mode 100755 index 0000000000..6cbec1f919 --- /dev/null +++ b/legacy/evas/conf-e-x11.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +make clean distclean +rm config.cache +./configure \ +--enable-software-x11 \ +--enable-image-loader-png \ +--enable-image-loader-jpeg \ +--enable-image-loader-eet \ +--enable-image-loader-edb \ +--enable-cpu-mmx \ +--enable-cpu-p2-only \ +--enable-cpu-c \ +--enable-scale-smooth \ +--enable-scale-sample \ +--enable-convert-8-rgb-332 \ +--enable-convert-8-rgb-666 \ +--enable-convert-8-rgb-232 \ +--enable-convert-8-rgb-222 \ +--enable-convert-8-rgb-221 \ +--enable-convert-8-rgb-121 \ +--enable-convert-8-rgb-111 \ +--enable-convert-16-rgb-565 \ +--enable-convert-16-rgb-555 \ +--enable-convert-16-rgb-rot-0 \ +--enable-convert-16-rgb-rot-90 \ +--enable-convert-16-rgb-rot-270 \ +--enable-convert-32-rgb-8888 \ +--enable-convert-32-rgbx-8888 \ +--enable-convert-32-bgr-8888 \ +--enable-convert-32-bgrx-8888 \ +--enable-convert-32-rgb-rot-0 \ +--enable-convert-32-rgb-rot-90 \ +--enable-convert-32-rgb-rot-270 \ +$@ diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index a4579062b3..47068de872 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -5,7 +5,7 @@ rm -f config.cache AC_INIT(configure.in) AC_ISC_POSIX -AM_INIT_AUTOMAKE(evas, 1.0.0_pre9) +AM_INIT_AUTOMAKE(evas, 1.0.0_pre10) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec index 40a5d95243..1951e1c98d 100644 --- a/legacy/evas/evas.spec +++ b/legacy/evas/evas.spec @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 1.0.0_pre8 +%define ver 1.0.0_pre10 %define rel 1 %define prefix /usr @@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT %build ./configure \ ---prefix=%prefix \ +--prefix=%{prefix} \ --enable-software-x11 \ --enable-image-loader-png \ --enable-image-loader-jpeg \ @@ -101,10 +101,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %attr(755,root,root) %{prefix}/lib/libevas.so* %attr(755,root,root) %{prefix}/lib/libevas.la +%attr(755,root,root) %{prefix}/bin/evas_* +%attr(755,root,root) %{prefix}/share/evas %files devel %attr(755,root,root) %{prefix}/lib/libevas.a -%attr(755,root,root) %{prefix}/bin/evas* +%attr(755,root,root) %{prefix}/bin/evas-config %{prefix}/include/Evas* %{prefix}/share/* %doc AUTHORS