Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
Makefile.am
Added Files:
emotion_gstreamer.c emotion_gstreamer.h
Log Message:
emotion can use gstreamer, now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 3 Sep 2005 19:07:24 -0000 1.5
+++ Makefile.am 2 Oct 2005 07:34:36 -0000 1.6
@@ -1,6 +1,13 @@
## Process this file with automake to produce Makefile.in
+if BUILD_XINE_MODULE
SUBDIRS = xine
+XINE_LIB_NAME=emotion_decoder_xine.la
+endif
+
+if BUILD_GSTREAMER_MODULE
+GSTREAMER_LIB_NAME = emotion_decoder_gstreamer.la
+endif
#AUTOMAKE_OPTIONS = 1.4 foreign
@@ -9,15 +16,28 @@
INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \
- @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@
+ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@ @GST_CFLAGS@
+
+pkgdir = $(libdir)/emotion
-pkgdir = $(libdir)/emotion
+pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME)
-pkg_LTLIBRARIES = emotion_decoder_xine.la
-emotion_decoder_xine_la_SOURCES = \
+if BUILD_XINE_MODULE
+emotion_decoder_xine_la_SOURCES = \
emotion_xine.c \
emotion_xine.h
emotion_decoder_xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
emotion_decoder_xine_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h
+endif
+
+if BUILD_GSTREAMER_MODULE
+emotion_decoder_gstreamer_la_SOURCES = \
+emotion_gstreamer.c \
+emotion_gstreamer.h
+emotion_decoder_gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@
+emotion_decoder_gstreamer_la_LDFLAGS = -module -avoid-version \
+ -L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
+emotion_decoder_gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
+endif
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
