From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Thu, 7 Feb 2008 23:22:23 +0000 (+0000)
Subject: Add gio in a few more places.
X-Git-Tag: 1.19.3~511^2~10696
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9c92633e65d943d86c92d44ff2f2d52ea346728;p=platform%2Fupstream%2Fgstreamer.git

Add gio in a few more places.

Original commit message from CVS:
* ext/Makefile.am:
* tests/check/Makefile.am:
* tests/check/pipelines/.cvsignore:
Add gio in a few more places.
---

diff --git a/ChangeLog b/ChangeLog
index f6d2b8f..fc1c382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-02-07  Jan Schmidt  <jan.schmidt@sun.com>
 
+	* ext/Makefile.am:
+	* tests/check/Makefile.am:
+	* tests/check/pipelines/.cvsignore:
+	Add gio in a few more places.
+
+2008-02-07  Jan Schmidt  <jan.schmidt@sun.com>
+
 	* configure.ac:
 	* ext/Makefile.am:
 	* tests/check/Makefile.am:
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 9d13ac5..05a603f 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -66,6 +66,7 @@ SUBDIRS = \
 DIST_SUBDIRS = \
   alsa \
   cdparanoia \
+  gio \
   gnomevfs \
   libvisual \
   ogg \
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index e837282..dae639c 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -77,6 +77,7 @@ endif
 check_PROGRAMS = \
 	$(check_alsa) \
 	$(check_gnomevfs) \
+	$(check_gio) \
 	$(check_ogg) \
 	$(check_pango) \
 	$(check_vorbis) \
@@ -282,6 +283,9 @@ libs_video_LDADD = \
 	$(GST_BASE_LIBS) \
 	$(LDADD)
 
+pipelines_gio_CFLAGS = $(GIO_CFLAGS) $(AM_CFLAGS)
+pipelines_gio_LDADD = $(GIO_LIBS) $(LDADD)
+
 pipelines_vorbisenc_CFLAGS = \
         $(GST_PLUGINS_BASE_CFLAGS) \
         $(AM_CFLAGS)
diff --git a/tests/check/pipelines/.gitignore b/tests/check/pipelines/.gitignore
index 7dd9ec6..76cffcb 100644
--- a/tests/check/pipelines/.gitignore
+++ b/tests/check/pipelines/.gitignore
@@ -1,7 +1,8 @@
 .dirstamp
+gio
 simple-launch-lines
 theoraenc
 vorbisdec
 vorbisenc
 oggmux
-streamheader
\ No newline at end of file
+streamheader