[Lunar-commits] CVS: moonbase/zbeta/evas-cvs BUILD, 1.2, 1.3 DEPENDS, 1.1, 1.2 DETAILS, 1.2, 1.3 CONFLICTS, 1.1, NONE

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/zbeta/evas-cvs
In directory espresso.foo-projects.org:/tmp/cvs-serv5503/evas-cvs

Modified Files:
	BUILD DEPENDS DETAILS 
Removed Files:
	CONFLICTS 
Log Message:
Making using of the /opt directory as suggested by sofar.  This also 
negates the need for the conflicts file.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/evas-cvs/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	3 Oct 2004 02:30:45 -0000	1.2
+++ BUILD	12 Nov 2004 00:36:35 -0000	1.3
@@ -1,19 +1,10 @@
 (
 
-  # Generate documentation of they user has doxygen installed
-  if module_installed doxygen; then
-    ./gendoc
-  fi
- 
-  # Some extra flags based off of what is in OPTS
-  local EXTRA_OPTS=""
-  if [ `echo "$OPTS" | grep "sse"` ] ; then
-    EXTRA_OPTS=" --enable-cpu-sse"
-  fi
-  if [ `echo "$OPTS" | grep "mmx"` ] ; then
-    EXTRA_OPTS="$EXTRA_OPTS --enable-cpu-mmx"
-  fi
- 
+  export PATH=$MODULE_PREFIX/bin:$PATH
+  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
+  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
+  export USER=nobody
+	
   ./autogen.sh --build=$BUILD                      \
                --prefix=$MODULE_PREFIX             \
                --sysconfdir=/etc                   \
@@ -53,7 +44,6 @@
                --enable-convert-32-rgb-rot-0       \
                --enable-convert-32-rgb-rot-270     \
                --enable-convert-32-rgb-rot-90      \
-               $EXTRA_OPTS                         \
                $OPTS                               &&
 
    default_make

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/evas-cvs/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS	29 Sep 2004 04:46:13 -0000	1.1
+++ DEPENDS	12 Nov 2004 00:36:35 -0000	1.2
@@ -4,10 +4,10 @@
 depends edb-cvs    &&
 depends grep       &&
 
-optional_depends "libpng" "--enable-image-loader-png" "" "enable PMG image loader"
-optional_depends "jpeg" "--enable-image-loader-jpeg" "" "enable JPEG image loader"
-optional_depends "DirectFB" "--enable-directfb" "" "enable the DirectFB rendering backend"
-optional_depends "cairo" "--enable-cairo-x11" "" "enable the Cairo X11 display engine"
-optional_depends "valgrind" "--enable-valgrind" "" "enable valgrid fixes to stop false reports"
-optional_depends "glut" "--enable-gl-x11" "" "enable OpenGL rendering backend"
+optional_depends "libpng" "--enable-image-loader-png" "" "enable PMG image loader"              &&
+optional_depends "jpeg" "--enable-image-loader-jpeg" "" "enable JPEG image loader"              &&
+optional_depends "DirectFB" "--enable-directfb" "" "enable the DirectFB rendering backend"      &&
+optional_depends "cairo" "--enable-cairo-x11" "" "enable the Cairo X11 display engine"          &&
+optional_depends "valgrind" "--enable-valgrind" "" "enable valgrid fixes to stop false reports" &&
+optional_depends "glut" "--enable-gl-x11" "" "enable OpenGL rendering backend"                  &&
 optional_depends "doxygen" "" "" "Build extra documentation"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/evas-cvs/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS	3 Oct 2004 02:30:45 -0000	1.2
+++ DETAILS	12 Nov 2004 00:36:35 -0000	1.3
@@ -6,6 +6,7 @@
         WEB_SITE=http://www.enlightenment.org/pages/evas.html
          ENTERED=20040928
          UPDATED=`date -u +%Y%m%d`
+   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
            SHORT="This is the CVS version of the evas module"
 
 cat << EOF

--- CONFLICTS DELETED ---