Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
Makefile.am
Removed Files:
emotion_gstreamer.c emotion_gstreamer.h
emotion_gstreamer_pipeline.c emotion_gstreamer_pipeline.h
emotion_xine.c emotion_xine.h emotion_xine_vo_out.c
Log Message:
put xine and gstreamer modules in their own subdir
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/modules/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 11 Nov 2007 09:12:08 -0000 1.12
+++ Makefile.am 11 May 2008 18:52:29 -0000 1.13
@@ -1,47 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in
-if BUILD_XINE_MODULE
-XINE_LIB_NAME = xine.la
-endif
-
-if BUILD_GSTREAMER_MODULE
-GSTREAMER_LIB_NAME = gstreamer.la
-endif
-
-AM_CPPFLAGS = \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/modules \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
-
-pkgdir = $(libdir)/emotion
-
-pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME)
-
-if BUILD_XINE_MODULE
-xine_la_SOURCES = \
-emotion_xine.c \
-emotion_xine.h \
-emotion_xine_vo_out.c
-xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
$(top_builddir)/src/lib/libemotion.la -lpthread
-xine_la_LDFLAGS = -module -avoid-version
-xine_la_DEPENDENCIES = $(top_builddir)/config.h
-endif
-
-if BUILD_GSTREAMER_MODULE
-gstreamer_la_SOURCES = \
-emotion_gstreamer.c \
-emotion_gstreamer.h \
-emotion_gstreamer_pipeline.c \
-emotion_gstreamer_pipeline.h
-gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@
$(top_builddir)/src/lib/libemotion.la
-gstreamer_la_LDFLAGS = -module -avoid-version
-gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
-endif
+SUBDIRS = xine gstreamer
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
