From: David I. Lehn <dlehn@users.sourceforge.net>
Date: Sun, 16 Dec 2001 20:02:53 +0000 (+0000)
Subject: merge fixup: guilaunch got removed, add it back
X-Git-Tag: RELEASE-0_3_1-BELGIANBEER~177
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b343c988b62a4590327d7bb07231b5e57b8124e2;p=platform%2Fupstream%2Fgstreamer.git

merge fixup: guilaunch got removed, add it back

Original commit message from CVS:
merge fixup: guilaunch got removed, add it back
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0de245d..576339c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,7 +19,7 @@ gstreamer_guilaunch_CFLAGS = \
 gstreamer_guilaunch_LDADD = \
 	$(LIBGLADE_GNOME_LIBS) $(LDADD)
 else
-GST_GUI_LAUNCH = 
+GST_GUI_LAUNCH =
 endif
 endif
 
@@ -31,7 +31,7 @@ bin_PROGRAMS = 	gstreamer-launch 	\
 		gstreamer-complete
 
 man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \
-	gstreamer-complete.1 gstreamer-compprep.1
+	gstreamer-complete.1 gstreamer-compprep.1 gstreamer-guilaunch.1
 
 gstreamer_launch_LDADD = $(GST_LIBS)
 gstreamer_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"