Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
Makefile.am configure.in ewl-config.in ewl.spec
Log Message:
- remove the edb dependancy
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Makefile.am 9 Feb 2005 04:31:40 -0000 1.21
+++ Makefile.am 16 Aug 2005 14:11:27 -0000 1.22
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src data tools
+SUBDIRS = src data
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- configure.in 30 Jul 2005 06:16:02 -0000 1.52
+++ configure.in 16 Aug 2005 14:11:27 -0000 1.53
@@ -55,42 +55,6 @@
fi
changequote([,])dnl
-EDB_CONFIG="edb-config"
-AC_ARG_WITH(edb-config,
-[ --with-edb-config=FILE edb-config script to use (eg /usr/bin/edb-config)],
-[
- EDB_CONFIG=$withval
- AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
- if test $EDB_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The edb-config development script you specified:"
- echo "$EDB_CONFIG"
- echo "was not found. Please check the path and make sure "
- echo "the script exists and is executable."
- AC_MSG_ERROR([Fatal Error: no edb-config detected.])
- fi
-],
-[
- AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
- if test $EDB_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The edb-config development script was not found in your execute"
- echo "path. This may mean one of several things"
- echo "1. You may not have installed the edb-devel (or edb-dev)"
- echo " packages."
- echo "2. You may have edb installed somewhere not covered by your path."
- echo ""
- echo "If this is the case make sure you have the packages installed, AND"
- echo "that the edb-config script is in your execute path (see your"
- echo "shell's manual page on setting the \$PATH environment variable), OR"
- echo "alternatively, specify the script to use with --with-edb-config."
- AC_MSG_ERROR([Fatal Error: no edb-config detected.])
- fi
-])
-
-edb_cflags=`$EDB_CONFIG --cflags`
-edb_libs=`$EDB_CONFIG --libs`
-
EVAS_CONFIG="evas-config"
AC_ARG_WITH(evas-config,
[ --with-evas-config=FILE evas-config script to use (eg
/usr/bin/evas-config)],
@@ -232,7 +196,7 @@
fi
])
-requirements="evas ecore edb edje"
+requirements="evas ecore edje"
CFLAGS=$emotion_cflags" "$CFLAGS
if test "x$EMOTION_CONFIG_IN_PATH" = "xyes"; then
@@ -254,9 +218,6 @@
CFLAGS=$PCFLAGS
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-
AC_SUBST(evas_cflags)
AC_SUBST(evas_libs)
@@ -280,8 +241,6 @@
src/bin/Makefile
src/lib/Ewl.h
src/lib/Makefile
-tools/Makefile
-tools/ewl_edb_ed/Makefile
data/Makefile
data/themes/Makefile
], [
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/ewl-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl-config.in 13 May 2004 22:27:53 -0000 1.6
+++ ewl-config.in 16 Aug 2005 14:11:27 -0000 1.7
@@ -42,11 +42,11 @@
if test @includedir@ != /usr/include ; then
[EMAIL PROTECTED]@
fi
- echo $includes @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@
-I$prefix/include/ewl
+ echo $includes @edje_cflags@ @ecore_cflags@ @evas_cflags@
-I$prefix/include/ewl
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -lewl @edje_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ -lm
+ echo $libdirs -lewl @edje_libs@ @ecore_libs@ @evas_libs@ -lm
;;
*)
echo "${usage}" 1>&2
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/ewl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl.spec 8 Jun 2005 11:59:50 -0000 1.18
+++ ewl.spec 16 Aug 2005 14:11:27 -0000 1.19
@@ -13,9 +13,9 @@
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel
BuildRequires: libjpeg-devel XFree86-devel
-BuildRequires: embryo-devel eet-devel edb-devel ecore-devel
+BuildRequires: embryo-devel eet-devel ecore-devel
BuildRequires: evas-devel etox-devel edje-devel emotion-devel
-Requires: edb ecore evas etox edje embryo eet
+Requires: ecore evas etox edje embryo eet
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -26,7 +26,7 @@
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: libjpeg-devel XFree86-devel
-Requires: embryo-devel eet-devel edb-devel ecore-devel
+Requires: embryo-devel eet-devel ecore-devel
Requires: evas-devel etox-devel edje-devel
%description devel
@@ -57,7 +57,6 @@
%doc AUTHORS COPYING* NEWS README TODO
%{_libdir}/libewl.so.*
%{_libdir}/libewl.la
-%{_bindir}/ewl_edb_ed
%{_datadir}/ewl
%files devel
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
