X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst-libs%2Fgst%2Fvideo%2FMakefile.am;h=730699540ea6db0f7e004167222d6186d9fd9312;hb=f2f53c02d843224594b7e7e4eb7e78edb8b3ec3f;hp=21ce6e48bc4cbc24a9eb6187e910f73bd2a6d913;hpb=0a9caca128b752650ad46896402756827408e01e;p=framework%2Fmultimedia%2Fgst-plugins-base0.10.git

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 21ce6e4..7306995 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -4,26 +4,45 @@ glib_enum_define = GST_VIDEO
 glib_gen_prefix = gst_video
 glib_gen_basename = video
 
+lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
+
+ORC_SOURCE=videoblendorc
+include $(top_srcdir)/common/orc.mak
+
 built_sources = video-enumtypes.c
 built_headers = video-enumtypes.h
-BUILT_SOURCES = $(built_sources) $(built_headers)
 
-lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
+# orc.mak sets BUILT_SOURCES as well
+BUILT_SOURCES += $(built_sources) $(built_headers)
 
 CLEANFILES = $(BUILT_SOURCES)
 
+# video-blend.h should be disted but not installed into the includedir
 libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \
-	video.c gstvideosink.c gstvideofilter.c convertframe.c
-nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES)
-
+	video.c gstvideosink.c gstvideofilter.c convertframe.c \
+	video-blend.c video-blend.h video-overlay-composition.c
+nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \
+	$(built_sources) $(built_headers) \
+	$(ORC_NODIST_SOURCES)
 libgstvideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
 libgstvideo_@GST_MAJORMINOR@include_HEADERS = \
-	video.h gstvideosink.h gstvideofilter.h
+	video.h gstvideosink.h gstvideofilter.h video-overlay-composition.h
 nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS = $(built_headers)
 
-libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
-libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS)\
+	$(GST_BASE_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(ORC_CFLAGS)
+
+libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) \
+	$(GST_LIBS) \
+	$(ORC_LIBS)
+
+libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = \
+	$(GST_LIB_LDFLAGS) \
+	$(GST_ALL_LDFLAGS) \
+	$(GST_LT_LDFLAGS)
 
 include $(top_srcdir)/common/gst-glib-gen.mak
 
@@ -31,9 +50,10 @@ if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir
 
 gir_headers=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@include_HEADERS))
-gir_headers+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES))
-gir_sources+=$(patsubst %,$(builddir)/%, $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES))
+gir_headers+=$(patsubst %,$(builddir)/%, $(built_headers))
+video_gir_sources=$(patsubst %,$(srcdir)/%, $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES))
+video_gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
+gir_sources=$(subst $(srcdir)/video-blend.h,,$(subst $(srcdir)/video-blend.c,,$(video_gir_sources)))
 gir_cincludes=$(patsubst %,--c-include='gst/video/%',$(libgstvideo_@GST_MAJORMINOR@include_HEADERS))
 gir_cincludes+=$(patsubst %,--c-include='gst/video/%',$(nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS))
 
@@ -87,7 +107,7 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \
 	           $(nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES) \
-	 -:CFLAGS $(DEFS) $(libgstvideo_@GST_MAJORMINOR@_la_CFLAGS) \
+	 -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideo_@GST_MAJORMINOR@_la_CFLAGS) \
 	 -:LDFLAGS $(libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS) \
 	           $(libgstvideo_@GST_MAJORMINOR@_la_LIBADD) \
 	           -ldl \