Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer
Modified Files:
ChangeLog Makefile.am configure.ac
Log Message:
Implemented install and dist targets for make, improved libao check in configure.ac
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ChangeLog 16 Oct 2003 14:54:33 -0000 1.4
+++ ChangeLog 16 Oct 2003 17:25:40 -0000 1.5
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.4 2003/10/16 14:54:33 tsauerbeck Exp $
+$Id: ChangeLog,v 1.5 2003/10/16 17:25:40 tsauerbeck Exp $
2003-10-16 Tilman Sauerbeck <[EMAIL PROTECTED]>
* configure.ac: Added endianess-check, added --enable-debug
@@ -6,6 +6,8 @@
* src/eplayer.c, src/playlist.c: added playlist_load_any(),
eplayer will now load files and directories as well
* code cleanup
+ * configure.ac, Makefile.am etc: implemented install and
+ dist targets
2003-10-15 Tilman Sauerbeck <[EMAIL PROTECTED]>
* data/eplayer.edc: Added basic playlist support,
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 15 Oct 2003 16:54:01 -0000 1.2
+++ Makefile.am 16 Oct 2003 17:25:40 -0000 1.3
@@ -1,7 +1,4 @@
-SUBDIRS = m4 src
+SUBDIRS = data m4 src
-EXTRA_DIST = TODO data
-
-dist-hook:
- rm -rf `find $(distdir)/data -name CVS`
+EXTRA_DIST = TODO
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.ac 16 Oct 2003 14:54:33 -0000 1.3
+++ configure.ac 16 Oct 2003 17:25:40 -0000 1.4
@@ -10,18 +10,25 @@
AC_HEADER_STDC
AC_C_BIGENDIAN
+AC_EXPAND_DIR(DATA_DIR, "$datadir/eplayer")
+AC_DEFINE_UNQUOTED(DATA_DIR, "$DATA_DIR", [Directory to install data files in])
+
AC_ARG_ENABLE(debug,
[ --enable-debug debug build (default: no)], [
AC_DEFINE([DEBUG], [], [Define to 1 if you want debugging output])
CFLAGS=`echo "$CFLAGS -g -Wall" | sed s/" -s"//`
])
-## The Simplistic Way
-AC_CHECK_LIB(ao,ao_driver_id)
-AC_CHECK_LIB(vorbis,vorbis_info_init)
-AC_CHECK_LIB(vorbisfile,ov_open)
+dnl I'd like to use XIPH_PATH_VORBIS here, but it seems to be quite
+dnl unstable and there's no pkgconfig file either :/
+AC_CHECK_LIB(vorbis, vorbis_info_init, ,
+ AC_MSG_ERROR(Cannot find libvorbis))
+
+AC_CHECK_LIB(vorbisfile, ov_open, ,
+ AC_MSG_ERROR(Cannot find libvorbisfile))
+
+XIPH_PATH_AO(, AC_MSG_ERROR(Cannot find libao))
-## The more complete way
AC_PATH_GENERIC(ecore, , ,
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
@@ -36,6 +43,9 @@
AC_OUTPUT([
Makefile
+data/Makefile
+data/fonts/Makefile
+data/images/Makefile
m4/Makefile
src/Makefile
])
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
