diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /evas | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'evas')
-rw-r--r-- | evas/evas-native_cvs.bb | 18 | ||||
-rw-r--r-- | evas/evas/pkg.m4 | 57 | ||||
-rw-r--r-- | evas/evas_cvs.bb | 0 |
3 files changed, 0 insertions, 75 deletions
diff --git a/evas/evas-native_cvs.bb b/evas/evas-native_cvs.bb deleted file mode 100644 index ea62f0344a..0000000000 --- a/evas/evas-native_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "The Enlightenment Canvas Library" -include evas_${PV}.bb -inherit native -DEPENDS = "freetype-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" - -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native" - -do_stage () { - for i in ${headers}; do - install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/ - done - oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/ -} - -#FIXME: Conflicts with zlib-devel on the build machine. Remove it and it builds. diff --git a/evas/evas/pkg.m4 b/evas/evas/pkg.m4 deleted file mode 100644 index c80e0acfc4..0000000000 --- a/evas/evas/pkg.m4 +++ /dev/null @@ -1,57 +0,0 @@ - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - diff --git a/evas/evas_cvs.bb b/evas/evas_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/evas/evas_cvs.bb +++ /dev/null |