From c8061af9e7bd272d76b6435ae86403b332d1dcd3 Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Mon, 1 Jan 2001 03:18:17 +0000 Subject: [PATCH] gstplay now builds from build-directory, doesn't require a make install Original commit message from CVS: gstplay now builds from build-directory, doesn't require a make install --- gstplay/.gitignore | 2 ++ gstplay/Makefile.am | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gstplay/.gitignore b/gstplay/.gitignore index e1ca49e2f7..5aa43e1a92 100644 --- a/gstplay/.gitignore +++ b/gstplay/.gitignore @@ -5,4 +5,6 @@ Makefile.in *.la .deps .libs + gstmediaplay +gstplay diff --git a/gstplay/Makefile.am b/gstplay/Makefile.am index 6ee8edcad7..bafb859f49 100644 --- a/gstplay/Makefile.am +++ b/gstplay/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \ - $(shell gnome-config --cflags gnomeui) $(shell gstreamer-config --cflags) + $(shell gnome-config --cflags gnomeui) -I.. bin_PROGRAMS = gstmediaplay @@ -25,10 +25,10 @@ CFLAGS += -O2 -Wall -DDATADIR=\""$(gladedir)/"\" #CFLAGS += -pg -O2 -Wall -DDATADIR=\""$(gladedir)/"\" gstmediaplay_CFLAGS = $(shell gnome-config --cflags gnomeui) $(shell libglade-config --cflags gnome) \ - $(shell gstreamer-config --cflags ) + -I.. gstmediaplay_LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome) \ - $(shell gstreamer-config --libs ) ./libgstmediaplay.la + ../gst/libgst.la ./libgstmediaplay.la if HAVE_LIBXV