X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2FMakefile.am;h=8fe194cc0cecae1e84a9332b97fabfbdca368a1a;hb=f1bf53823a0244a1dbde8de69500556a629e0b68;hp=f966156c5a256bd5aec972577bc60170cc425b31;hpb=510ee7be34e5af9e48646025a4628f3fa9e641ed;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f966156..8fe194c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,110 +1,46 @@
-### assemble a list of programs we want to build and install
 
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_SRC = 
-GST_LOADSAVE_SRC_V = 
-else
-GST_LOADSAVE_SRC = gst-xmllaunch
-GST_LOADSAVE_SRC_V = \
-	gst-xmllaunch-@GST_MAJORMINOR@
-endif
-
-if GST_DISABLE_PARSE
-GST_PARSE_SRC = 
-GST_PARSE_SRC_V = 
-else
-GST_PARSE_SRC = gst-launch
-GST_PARSE_SRC_V = gst-launch-@GST_MAJORMINOR@
-endif
-
-
-GST_OTHER_SRC = \
-	gst-inspect \
-	gst-typefind
-GST_OTHER_SRC_V = \
+bin_PROGRAMS = \
 	gst-inspect-@GST_MAJORMINOR@ \
 	gst-typefind-@GST_MAJORMINOR@
 
-### so all of the programs we want to build
-bin_PROGRAMS = \
-	$(GST_LOADSAVE_SRC) $(GST_LOADSAVE_SRC_V) \
-	$(GST_PARSE_SRC) $(GST_PARSE_SRC_V) \
-	$(GST_OTHER_SRC) $(GST_OTHER_SRC_V)
-
-# make sure each versioned tool has the right source file and flags
-if !GST_DISABLE_LOADSAVE
-gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
-gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
-gst_xmllaunch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
-endif
-
-if !GST_DISABLE_PARSE
-gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
-gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
-gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
-endif
-
 gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c tools.h
 gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
 gst_inspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
+
 gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c tools.h
 gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
 gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 
-# make sure each unversioned tool comes from gst-run.c
-if !GST_DISABLE_LOADSAVE
-gst_xmllaunch_SOURCES = gst-run.c
-endif
-
 if !GST_DISABLE_PARSE
-gst_launch_SOURCES = gst-run.c
-endif
+bin_PROGRAMS += gst-launch-@GST_MAJORMINOR@
 
-gst_inspect_SOURCES = gst-run.c
-gst_typefind_SOURCES = gst-run.c
-
-# CFLAGS and libs for nonversioned frontend binaries
-AM_CFLAGS = $(GLIB_ONLY_CFLAGS)
-LDADD = $(GLIB_ONLY_LIBS)
-# due to depcomp not using AM_CFLAGS for rh9/yd3, we also set AM_CPPFLAGS
-AM_CPPFLAGS = $(GLIB_ONLY_CFLAGS)
+gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
+gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
+endif
 
 Android.mk: Makefile.am
 	androgenizer -:PROJECT gstreamer \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:EXECUTABLE gst-inspect -:TAGS eng debug \
+	 -:EXECUTABLE gst-inspect-@GST_MAJORMINOR@ -:TAGS eng debug \
 	 -:SOURCES $(gst_inspect_@GST_MAJORMINOR@_SOURCES) \
 	 -:CFLAGS $(DEFS) $(gst_inspect_@GST_MAJORMINOR@_CFLAGS) \
 	 -:LDFLAGS $(gst_inspect_@GST_MAJORMINOR@_LDADD) \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-	 -:EXECUTABLE gst-launch -:TAGS eng debug \
+	 -:EXECUTABLE gst-launch-@GST_MAJORMINOR@ -:TAGS eng debug \
 	 -:SOURCES $(gst_launch_@GST_MAJORMINOR@_SOURCES) \
 	 -:CFLAGS $(DEFS) $(gst_launch_@GST_MAJORMINOR@_CFLAGS) \
 	 -:LDFLAGS $(gst_launch_@GST_MAJORMINOR@_LDADD) \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
 	> $@
 
-### man pages we want to install
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_MAN=
-else
-GST_LOADSAVE_MAN = \
-	gst-xmllaunch-@GST_MAJORMINOR@.1
-endif
-
-if GST_DISABLE_PARSE
-GST_PARSE_MAN=
-else
-GST_PARSE_MAN = \
-	gst-launch-@GST_MAJORMINOR@.1
-endif
-
-
-GST_OTHER_MAN = \
+manpages = \
 	gst-inspect-@GST_MAJORMINOR@.1 \
 	gst-typefind-@GST_MAJORMINOR@.1
 
-manpages = $(GST_LOADSAVE_MAN) $(GST_PARSE_MAN) $(GST_OTHER_MAN)
+if !GST_DISABLE_PARSE
+manpages += gst-launch-@GST_MAJORMINOR@.1
+endif
 
 CLEANFILES = $(manpages) *.gcno *.gcda
 man_MANS = $(manpages)
@@ -119,7 +55,6 @@ EXTRA_DIST = \
 	gst-inspect.1.in \
 	gst-launch.1.in \
 	gst-typefind.1.in \
-	gst-xmllaunch.1.in \
 	gst-plot-timeline.py
 
 %-@GST_MAJORMINOR@.1: %.1.in
@@ -127,7 +62,6 @@ EXTRA_DIST = \
 		-e s,gst-inspect,gst-inspect-@GST_MAJORMINOR@,g \
 		-e s,gst-launch,gst-launch-@GST_MAJORMINOR@,g \
 		-e s,gst-typefind,gst-typefind-@GST_MAJORMINOR@,g \
-		-e s,gst-xmllaunch,gst-xmllaunch-@GST_MAJORMINOR@,g \
 		-e s,GST_MAJORMINOR,@GST_MAJORMINOR@,g \
 		$< >$@