mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-28 06:42:16 +00:00
fix to get guilaunch to build properly with gnome2
Original commit message from CVS: fix to get guilaunch to build properly with gnome2
This commit is contained in:
parent
59d1e1d051
commit
51bb2b1c4c
1 changed files with 12 additions and 10 deletions
|
@ -11,17 +11,15 @@ else
|
||||||
GST_LOADSAVE_SRC = gstreamer-compprep
|
GST_LOADSAVE_SRC = gstreamer-compprep
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_GLIB2
|
if USE_GLIB2
|
||||||
if HAVE_LIBGLADE_GNOME
|
if HAVE_LIBGLADE_GNOME
|
||||||
GST_GUI_LAUNCH = gstreamer-guilaunch
|
GST_GUI_LAUNCH = gstreamer-guilaunch
|
||||||
gstreamer_guilaunch_CFLAGS = \
|
else !HAVE_LIBGLADE_GNOME
|
||||||
$(LIBGLADE_GNOME_CFLAGS) $(CFLAGS)
|
|
||||||
gstreamer_guilaunch_LDADD = \
|
|
||||||
$(LIBGLADE_GNOME_LIBS) $(LDADD)
|
|
||||||
else
|
|
||||||
GST_GUI_LAUNCH =
|
GST_GUI_LAUNCH =
|
||||||
endif
|
endif !HAVE_LIBGLADE_GNOME
|
||||||
endif
|
else !USE_GLIB2
|
||||||
|
GST_GUI_LAUNCH = gstreamer-guilaunch
|
||||||
|
endif !USE_GLIB2
|
||||||
|
|
||||||
bin_PROGRAMS = gstreamer-launch \
|
bin_PROGRAMS = gstreamer-launch \
|
||||||
$(GST_GUI_LAUNCH) \
|
$(GST_GUI_LAUNCH) \
|
||||||
|
@ -36,7 +34,11 @@ man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \
|
||||||
gstreamer_launch_LDADD = $(GST_LIBS) #-lefence
|
gstreamer_launch_LDADD = $(GST_LIBS) #-lefence
|
||||||
gstreamer_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
gstreamer_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||||
|
|
||||||
if !USE_GLIB2
|
if USE_GLIB2
|
||||||
|
gstreamer_guilaunch_LDADD = $(LIBGLADE_GNOME_LIBS) $(GST_LIBS)
|
||||||
|
gstreamer_guilaunch_CFLAGS = $(LIBGLADE_GNOME_CFLAGS) $(GST_CFLAGS)
|
||||||
|
# you shouldn't build gstreamer-guilaunch without libglade-gnome, though...
|
||||||
|
else
|
||||||
gstreamer_guilaunch_LDADD = $(GST_LIBS)
|
gstreamer_guilaunch_LDADD = $(GST_LIBS)
|
||||||
gstreamer_guilaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
gstreamer_guilaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\"
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue