mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 03:31:05 +00:00
Massive build fixup. Will send message to -devel list later with details on the changes and what they mean for Makef...
Original commit message from CVS: Massive build fixup. Will send message to -devel list later with details on the changes and what they mean for Makefile.am writers. Check docs/random/omega/build/TODO for a list of things that I had to make sure of. NOTE: this requires a complete rebuild of all plugins, since I also changed the STATE enum to a bitfield instead of sequential numbers.
This commit is contained in:
Erik Walthinsen
parent
3c288c183a
commit
9ca8248cc2
53 changed files with 226 additions and 189 deletions
|
|
@ -1,3 +1,6 @@
|
|||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
|
||||
# if libglade is present, build the player and editor
|
||||
if HAVE_LIBGLADE_GNOME
|
||||
SUBDIRS_LGG = gstplay editor
|
||||
|
|
@ -8,7 +11,7 @@ endif
|
|||
SUBDIRS = include gst libs plugins tools test tests examples $(SUBDIRS_LGG) docs
|
||||
|
||||
# These are all the possible subdirs
|
||||
DIST_SUBDIRS = include gst libs plugins tools test tests examples gstplay editor docs
|
||||
DIST_SUBDIRS = intl po include gst libs plugins tools test tests examples gstplay editor docs
|
||||
|
||||
|
||||
bin_SCRIPTS = gstreamer-config
|
||||
|
|
@ -16,7 +19,7 @@ bin_SCRIPTS = gstreamer-config
|
|||
m4datadir = $(datadir)/aclocal
|
||||
m4data_DATA = gstreamer.m4
|
||||
|
||||
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 LICENSE REQUIREMENTS
|
||||
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 LICENSE REQUIREMENTS ABOUT-NLS
|
||||
|
||||
dist-hook:
|
||||
cp gstreamer.spec $(distdir)
|
||||
|
|
|
|||
10
acconfig.h
10
acconfig.h
|
|
@ -1,3 +1,13 @@
|
|||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
|
||||
/* Gettext stuff */
|
||||
#undef ENABLE_NLS
|
||||
#undef HAVE_CATGETS
|
||||
#undef HAVE_GETTEXT
|
||||
#undef HAVE_LC_MESSAGES
|
||||
#undef HAVE_STPCPY
|
||||
|
||||
#undef PLUGINS_DIR
|
||||
#undef PLUGINS_SRCDIR
|
||||
#undef PLUGINS_USE_SRCDIR
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# FIXME FIXME
|
||||
|
||||
Gamesdir = $(datadir)/gnome/apps/Games
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/gst \
|
||||
|
|
@ -29,4 +31,3 @@ oaf_DATA = $(OAF_FILES)
|
|||
|
||||
EXTRA_DIST = gstmediaplay.desktop $(OAF_FILES) \
|
||||
bonobo-gstmediaplay-ui.xml
|
||||
|
||||
|
|
|
|||
63
configure.in
63
configure.in
|
|
@ -4,17 +4,26 @@ AC_CANONICAL_SYSTEM
|
|||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl FIXME this should be GSTREAMER_ now
|
||||
STREAMER_MAJOR_VERSION=0
|
||||
STREAMER_MINOR_VERSION=1
|
||||
STREAMER_MICRO_VERSION=0
|
||||
STREAMER_VERSION=$STREAMER_MAJOR_VERSION.$STREAMER_MINOR_VERSION.$STREAMER_MICRO_VERSION
|
||||
|
||||
PACKAGE=gstreamer
|
||||
VERSION=$STREAMER_VERSION
|
||||
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
dnl libtool
|
||||
STREAMER_CURRENT=0
|
||||
STREAMER_REVISION=0
|
||||
STREAMER_AGE=0
|
||||
GSTREAMER_LIBVERSION=$STREAMER_CURRENT:$STREAMER_REVISION:$STREAMER_AGE
|
||||
|
||||
AM_INIT_AUTOMAKE(gstreamer, $STREAMER_VERSION)
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
dnl Add parameters for aclocal
|
||||
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
|
||||
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
|
||||
|
|
@ -27,6 +36,7 @@ AC_SUBST(STREAMER_VERSION)
|
|||
AC_SUBST(STREAMER_CURRENT)
|
||||
AC_SUBST(STREAMER_REVISION)
|
||||
AC_SUBST(STREAMER_AGE)
|
||||
AC_SUBST(GSTREAMER_LIBVERSION)
|
||||
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
|
@ -40,6 +50,9 @@ AM_DISABLE_STATIC
|
|||
AC_LIBTOOL_DLOPEN
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
dnl ALL_LINGUAS=""
|
||||
dnl AM_GNU_GETTEXT
|
||||
|
||||
CFLAGS=""
|
||||
|
||||
dnl ##############################
|
||||
|
|
@ -172,7 +185,11 @@ dnl Check for libesd
|
|||
AM_PATH_ESD(0.2.12, HAVE_LIBESD=yes, HAVE_LIBESD=no)
|
||||
|
||||
dnl Check for libasound
|
||||
alsa_save_LIBS=$LIBS
|
||||
alsa_save_CFLAGS=$CFLAGS
|
||||
AM_PATH_ALSA(0.5.0, HAVE_LIBASOUND=yes, HAVE_LIBASOUND=no)
|
||||
LIBS=$alsa_save_LIBS
|
||||
CFLAGS=$alsa_save_CFLAGS
|
||||
|
||||
dnl Check for libgdk-pixbuf
|
||||
AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no)
|
||||
|
|
@ -228,16 +245,27 @@ HAVE_LIBGLADE_GNOME="no"
|
|||
AC_PATH_PROG(LIBGLADE_CONFIG_PATH, libglade-config, no)
|
||||
if test x$LIBGLADE_CONFIG_PATH = xno; then
|
||||
AC_MSG_WARN(Couldn't find libglade-config - Can't build gstplay)
|
||||
LIBGLADE_GNOME_LIBS=
|
||||
LIBGLADE_GNOME_CFLAGS=
|
||||
HAVE_LIBGLADE_GNOME=NO
|
||||
else
|
||||
libglade_save_CFLAGS=${CFLAGS}
|
||||
CFLAGS="$CFLAGS `$LIBGLADE_CONFIG_PATH --libs gnome` `$LIBGLADE_CONFIG_PATH --cflags gnome`"
|
||||
LIBGLADE_GNOME_LIBS=`libglade-config --libs gnome`
|
||||
LIBGLADE_GNOME_CFLAGS=`libglade-config --cflags gnome`
|
||||
libglade_save_CFLAGS="$CFLAGS"
|
||||
libglade_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $LIBGLADE_GNOME_CFLAGS"
|
||||
LIBS="$LIBS $LIBGLADE_GNOME_LIBS"
|
||||
HAVE_LIBGLADE_GNOME="no"
|
||||
AC_TRY_LINK([#include <glade/glade.h>],[glade_gnome_init();],
|
||||
HAVE_LIBGLADE_GNOME="yes",
|
||||
AC_MSG_WARN(
|
||||
[Couldn't find gnome libraries for libglade - Can't build gstplay])
|
||||
)
|
||||
CFLAGS=${libglade_save_CFLAGS}
|
||||
CFLAGS="$libglade_save_CFLAGS"
|
||||
LIBS="$libglade_save_LIBS"
|
||||
fi
|
||||
AC_SUBST(LIBGLADE_GNOME_LIBS)
|
||||
AC_SUBST(LIBGLADE_GNOME_CFLAGS)
|
||||
|
||||
|
||||
dnl Check for atomic.h
|
||||
|
|
@ -313,7 +341,6 @@ AC_CHECK_HEADER(cdda_interface.h, :, HAVE_CDPARANOIA=no)
|
|||
AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
|
||||
AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
||||
|
||||
|
||||
dnl Check for liblame
|
||||
AC_MSG_CHECKING(LAME library)
|
||||
AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, )
|
||||
|
|
@ -500,6 +527,9 @@ fi
|
|||
|
||||
if test "x$USE_PROFILING" = xyes; then
|
||||
CFLAGS="$CFLAGS -pg"
|
||||
FOMIT_FRAME_POINTER=""
|
||||
else
|
||||
FOMIT_FRAME_POINTER="-fomit-frame-pointer"
|
||||
fi
|
||||
|
||||
dnl #############################
|
||||
|
|
@ -571,9 +601,26 @@ CFLAGS="$CFLAGS -O6 -Wall"
|
|||
|
||||
dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS
|
||||
dnl need it, either.
|
||||
|
||||
dnl Private vars for libgst only
|
||||
LIBGST_LIBS="$LIBS"
|
||||
LIBGST_CFLAGS="$CFLAGS"
|
||||
AC_SUBST(LIBGST_LIBS)
|
||||
AC_SUBST(LIBGST_CFLAGS)
|
||||
|
||||
dnl Vars for everyone else
|
||||
GST_LIBS="\$(top_builddir)/gst/libgst.la"
|
||||
GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
|
||||
AC_SUBST(GST_LIBS)
|
||||
AC_SUBST(GST_CFLAGS)
|
||||
|
||||
dnl CFLAGS for everyone else
|
||||
CFLAGS="$CFLAGS $GST_CFLAGS"
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
dnl AC_SUBST(CPPFLAGS)
|
||||
dnl AC_SUBST(LDFLAGS)
|
||||
|
||||
|
||||
dnl #############################
|
||||
|
|
@ -589,6 +636,8 @@ dnl # Make the output files #
|
|||
dnl #########################
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
intl/Makefile
|
||||
po/Makefile.in
|
||||
include/Makefile
|
||||
include/wine/Makefile
|
||||
gst/Makefile
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
|
|||
# The directory containing the source code (if it contains documentation).
|
||||
DOC_SOURCE_DIR=$(top_srcdir)/gst
|
||||
|
||||
CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/.libs/libgst.so $(top_srcdir)/gst/elements/.libs/libgstelements.so
|
||||
|
||||
EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt $(DOC_MAIN_SGML_FILE)
|
||||
|
||||
HTML_DIR=$(datadir)/gstreamer/html
|
||||
|
|
|
|||
|
|
@ -9,11 +9,8 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
|
|||
# The directory containing the source code (if it contains documentation).
|
||||
DOC_SOURCE_DIR=$(top_srcdir)/plugins
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
|
||||
CFLAGS = `gstreamer-config --cflags` -Wall -g
|
||||
LDFLAGS = `gstreamer-config --libs`
|
||||
#CFLAGS = `gstreamer-config --cflags` -Wall -g
|
||||
#LDFLAGS = `gstreamer-config --libs`
|
||||
|
||||
EXTRA_DIST=$(DOC_MODULE).types.in $(DOC_MODULE)-sections.txt $(DOC_MAIN_SGML_FILE) gstdoc-mkdb gstdoc-mktmpl gstdoc-scanobj
|
||||
|
||||
|
|
|
|||
7
docs/random/omega/build/TODO
Normal file
7
docs/random/omega/build/TODO
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
Convert all the STREAMER_ version stuff to GSTREAMER_
|
||||
|
||||
Convert all the --version-info lines to use GSTREAMER_LIBVERSION
|
||||
|
||||
Fix all the masses of Makefile.am's that override CFLAGS
|
||||
|
||||
Makefile.am's should use the library_la_CFLAGS and _LIBADD always
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome)
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gst $(shell libglade-config --cflags gnome) \
|
||||
$(shell gnome-config --cflags gnomeui)
|
||||
|
||||
CFLAGS += -DDATADIR="\"$(gladedir)/\"" $(GNOME_CFLAGS) $(LIBGLADE_GNOME_CFLAGS)
|
||||
LDFLAGS += $(GNOME_LIBS) $(LIBGLADE_GNOME_LIBS)
|
||||
|
||||
lib_LTLIBRARIES = libgsteditor.la
|
||||
|
||||
|
|
@ -28,7 +25,7 @@ libgsteditorinclude_HEADERS = \
|
|||
|
||||
bin_PROGRAMS = gsteditor
|
||||
gsteditor_SOURCES = editor.c
|
||||
gsteditor_LDFLAGS = libgsteditor.la
|
||||
gsteditor_LDFLAGS = libgsteditor.la $(GST_LIBS)
|
||||
|
||||
gladedir = $(datadir)/gsteditor
|
||||
glade_DATA = editor.glade editorelement.glade
|
||||
|
|
@ -41,8 +38,6 @@ noinst_HEADERS = \
|
|||
gsteditorimage.h \
|
||||
gsteditorcreate.h
|
||||
|
||||
CFLAGS = -O2 -Wall -DDATADIR="\"$(gladedir)/\""
|
||||
|
||||
SUBDIRS = pixmaps
|
||||
|
||||
EXTRA_DIST = $(glade_DATA)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = autoplug
|
||||
|
||||
LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GNOME_CFLAGS)
|
||||
# just an app here, we're safe
|
||||
LIBS += $(GNOME_LIBS) $(GST_LIBS)
|
||||
CFLAGS += $(GNOME_CFLAGS) $(GST_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
noinst_PROGRAMS = helloworld
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = helloworld2
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,3 @@ noinst_LTLIBRARIES = libexample.la
|
|||
|
||||
libexample_la_SOURCES = example.c
|
||||
noinst_HEADERS = example.h
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
|
||||
libexample_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue2
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue3
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue4
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = thread
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = createxml runxml
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ libgstinclude_HEADERS = \
|
|||
gstparse.h \
|
||||
gstxml.h
|
||||
|
||||
|
||||
noinst_HEADERS = \
|
||||
gst_private.h \
|
||||
gstarch.h \
|
||||
|
|
@ -86,7 +85,8 @@ noinst_HEADERS = \
|
|||
gstppc.h \
|
||||
gstpropsprivate.h
|
||||
|
||||
libgst_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS)
|
||||
libgst_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
CFLAGS = $(LIBGST_CFLAGS)
|
||||
LIBS = $(LIBGST_LIBS)
|
||||
libgst_la_LDFLAGS = -version-info $(GSTREAMER_LIBVERSION)
|
||||
|
||||
EXTRA_DIST = ROADMAP
|
||||
|
|
|
|||
|
|
@ -44,5 +44,5 @@ noinst_HEADERS = \
|
|||
|
||||
CFLAGS += -O2 -Wall
|
||||
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(GHTTP_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(GSTREAMER_LIBVERSION)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#ifndef __GST_H__
|
||||
#define __GST_H__
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <gst/gstinfo.h>
|
||||
#include <gst/gstobject.h>
|
||||
#include <gst/gstpad.h>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,29 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
/***** until we have gettext set up properly, don't even try this
|
||||
#ifdef ENABLE_NLS
|
||||
#include <libintl.h>
|
||||
#define _(String) dgettext(PACKAGE,String)
|
||||
#ifdef gettext_noop
|
||||
#define N_(String) gettext_noop(String)
|
||||
#else // gettext_noop
|
||||
#define N_(String) (String)
|
||||
#endif // gettext_noop
|
||||
#else // ENABLE_NLS
|
||||
#define _(String) (String)
|
||||
#define N_(String) (String)
|
||||
#define textdomain(String) (String)
|
||||
#define gettext(String) (String)
|
||||
#define dgettext(Domain,String) (String)
|
||||
#define dcgettext(Domain,String,Type) (String)
|
||||
#define bindtextdomain(Domain,Directory) (Domain)
|
||||
#endif // ENABLE_NLS
|
||||
*****/
|
||||
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
#ifndef __GST_CAPS_H__
|
||||
#define __GST_CAPS_H__
|
||||
|
||||
//#include <gnome-xml/parser.h>
|
||||
#include <parser.h>
|
||||
#include <parser.h> // NOTE: this is xml-config's fault
|
||||
|
||||
#include <gst/gstprops.h>
|
||||
|
||||
typedef struct _GstCaps GstCaps;
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
#ifndef __GST_ELEMENT_H__
|
||||
#define __GST_ELEMENT_H__
|
||||
|
||||
//#include <gnome-xml/parser.h>
|
||||
#include <parser.h>
|
||||
#include <parser.h> // NOTE: this is xml-config's fault
|
||||
|
||||
#include <gst/gstobject.h>
|
||||
#include <gst/gstpad.h>
|
||||
|
|
@ -38,11 +37,11 @@ extern "C" {
|
|||
|
||||
|
||||
typedef enum {
|
||||
GST_STATE_NONE_PENDING = -1,
|
||||
GST_STATE_NULL = 0,
|
||||
GST_STATE_READY = 1,
|
||||
GST_STATE_PLAYING = 2,
|
||||
GST_STATE_PAUSED = 3,
|
||||
GST_STATE_NONE_PENDING = 0,
|
||||
GST_STATE_NULL = (1 << 0),
|
||||
GST_STATE_READY = (1 << 1),
|
||||
GST_STATE_PLAYING = (1 << 2),
|
||||
GST_STATE_PAUSED = (1 << 3),
|
||||
} GstElementState;
|
||||
|
||||
typedef enum {
|
||||
|
|
@ -53,11 +52,11 @@ typedef enum {
|
|||
|
||||
static inline char *_gst_print_statename(int state) {
|
||||
switch (state) {
|
||||
case -1: return "none pending";break;
|
||||
case 0: return "null";break;
|
||||
case 1: return "ready";break;
|
||||
case 2: return "playing";break;
|
||||
case 3: return "paused";break;
|
||||
case GST_STATE_NONE_PENDING: return "none pending";break;
|
||||
case GST_STATE_NULL: return "null";break;
|
||||
case GST_STATE_READY: return "ready";break;
|
||||
case GST_STATE_PLAYING: return "playing";break;
|
||||
case GST_STATE_PAUSED: return "paused";break;
|
||||
default: return "";
|
||||
}
|
||||
return "";
|
||||
|
|
@ -66,13 +65,14 @@ static inline char *_gst_print_statename(int state) {
|
|||
#define GST_STATE(obj) (GST_ELEMENT(obj)->current_state)
|
||||
#define GST_STATE_PENDING(obj) (GST_ELEMENT(obj)->pending_state)
|
||||
|
||||
#define GST_STATE_TRANSITION(obj) ((GST_STATE(obj)<<4) | GST_STATE_PENDING(obj))
|
||||
#define GST_STATE_NULL_TO_READY ((GST_STATE_NULL<<4) | GST_STATE_READY)
|
||||
#define GST_STATE_READY_TO_PLAYING ((GST_STATE_READY<<4) | GST_STATE_PLAYING)
|
||||
#define GST_STATE_PLAYING_TO_PAUSED ((GST_STATE_PLAYING<<4) | GST_STATE_PAUSED)
|
||||
#define GST_STATE_PAUSED_TO_PLAYING ((GST_STATE_PAUSED<<4) | GST_STATE_PLAYING)
|
||||
#define GST_STATE_PLAYING_TO_READY ((GST_STATE_PLAYING<<4) | GST_STATE_READY)
|
||||
#define GST_STATE_READY_TO_NULL ((GST_STATE_READY<<4) | GST_STATE_NULL)
|
||||
// Note: using 8 bit shift mostly "just because", it leaves us enough room to grow <g>
|
||||
#define GST_STATE_TRANSITION(obj) ((GST_STATE(obj)<<8) | GST_STATE_PENDING(obj))
|
||||
#define GST_STATE_NULL_TO_READY ((GST_STATE_NULL<<8) | GST_STATE_READY)
|
||||
#define GST_STATE_READY_TO_PLAYING ((GST_STATE_READY<<8) | GST_STATE_PLAYING)
|
||||
#define GST_STATE_PLAYING_TO_PAUSED ((GST_STATE_PLAYING<<8) | GST_STATE_PAUSED)
|
||||
#define GST_STATE_PAUSED_TO_PLAYING ((GST_STATE_PAUSED<<8) | GST_STATE_PLAYING)
|
||||
#define GST_STATE_PLAYING_TO_READY ((GST_STATE_PLAYING<<8) | GST_STATE_READY)
|
||||
#define GST_STATE_READY_TO_NULL ((GST_STATE_READY<<8) | GST_STATE_NULL)
|
||||
|
||||
#define GST_TYPE_ELEMENT \
|
||||
(gst_element_get_type())
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
#ifndef __GST_PAD_H__
|
||||
#define __GST_PAD_H__
|
||||
|
||||
//#include <gnome-xml/parser.h>
|
||||
#include <parser.h>
|
||||
#include <parser.h> // NOTE: This is xml-config's fault
|
||||
|
||||
#include <gst/gstobject.h>
|
||||
#include <gst/gstbuffer.h>
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@
|
|||
#define __GST_PLUGIN_H__
|
||||
|
||||
#include <gmodule.h>
|
||||
//#include <gnome-xml/parser.h>
|
||||
#include <parser.h>
|
||||
#include <parser.h> // NOTE: this is xml-config's fault
|
||||
|
||||
#include <gst/gsttype.h>
|
||||
#include <gst/gstelement.h>
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@
|
|||
#define __GST_PROPS_H__
|
||||
|
||||
#include <glib.h>
|
||||
//#include <gnome-xml/parser.h>
|
||||
#include <parser.h>
|
||||
#include <parser.h> // NOTE: this is xml-config's fault
|
||||
|
||||
|
||||
typedef struct _GstProps GstProps;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@ filterdir = $(libdir)/gst
|
|||
|
||||
filter_LTLIBRARIES = libgsttypes.la
|
||||
|
||||
libgsttypes_la_DEPENDENCIES = ../libgst.la
|
||||
libgsttypes_la_SOURCES = \
|
||||
gsttypes.c
|
||||
|
||||
#noinst_HEADERS =
|
||||
|
||||
libgsttypes_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
libgsttypes_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
libgsttypes_la_LDFLAGS = -version-info $(GSTREAMER_LIBVERSION)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \
|
||||
$(shell gnome-config --cflags gnomeui) -I..
|
||||
# FIXME FIXME
|
||||
|
||||
LIBADD += $(GNOME_LIBS) $(GST_LIBS)
|
||||
CFLAGS += $(GNOME_CFLAGS) $(GST_CFLAGS) -DDATADIR=\""$(gladedir)/"\"
|
||||
|
||||
bin_PROGRAMS = gstmediaplay
|
||||
|
||||
|
|
@ -31,21 +32,6 @@ noinst_HEADERS = \
|
|||
|
||||
|
||||
CFLAGS += -O2 -Wall -DDATADIR=\""$(gladedir)/"\"
|
||||
#CFLAGS += -pg -O2 -Wall -DDATADIR=\""$(gladedir)/"\"
|
||||
|
||||
gstmediaplay_CFLAGS = $(shell gnome-config --cflags gnomeui) $(shell libglade-config --cflags gnome) \
|
||||
-I..
|
||||
|
||||
gstmediaplay_LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome) \
|
||||
../gst/libgst.la ./libgstmediaplay.la
|
||||
|
||||
|
||||
if HAVE_LIBXV
|
||||
xvlibs=-lXv
|
||||
else
|
||||
xvlibs=
|
||||
endif
|
||||
|
||||
gstmediaplay_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
|
||||
|
||||
gstmediaplay_CFLAGS = $(LIBGLADE_GNOME_CFLAGS)
|
||||
gstmediaplay_LDADD = $(LIBGLADE_GNOME_LIBS) libgstmediaplay.la
|
||||
|
|
|
|||
|
|
@ -15,7 +15,5 @@ libgstcolorspaceinclude_HEADERS = gstcolorspace.h
|
|||
|
||||
noinst_HEADERS = yuv2rgb.h
|
||||
|
||||
CFLAGS += -Wall -O2 -fomit-frame-pointer -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
# FIXME is this needed?
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -21,7 +21,4 @@ check_PROGRAMS = gbtest
|
|||
gbtest_SOURCES = gbtest.c
|
||||
gbtest_LDADD = libgstgetbits.la $(top_srcdir)/gst/libgst.la
|
||||
|
||||
CFLAGS += -Wall -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
if HAVE_LIBMMX
|
||||
GSTIDCTARCH_SRCS = mmxidct.S mmx32idct.c sseidct.S
|
||||
else
|
||||
|
|
@ -22,13 +21,10 @@ libgstidctinclude_HEADERS = gstidct.h
|
|||
check_PROGRAMS = ieeetest
|
||||
|
||||
ieeetest_SOURCES = ieeetest.c
|
||||
ieeetest_LDADD = libgstidct.la $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
ieeetest_CFLAGS = $(shell gnome-config --cflags gnomeui) -g -Wall
|
||||
ieeetest_LDFLAGS = $(shell gnome-config --libs gnomeui)
|
||||
ieeetest_LDADD = libgstidct.la
|
||||
ieeetest_CFLAGS = $(GNOME_CFLAGS)
|
||||
ieeetest_LDFLAGS = $(GNOME_LIBS)
|
||||
|
||||
noinst_HEADERS = dct.h
|
||||
|
||||
CFLAGS += -Wall -O2 -funroll-all-loops -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -9,7 +9,4 @@ libgstputbitsinclude_HEADERS = gstputbits.h
|
|||
|
||||
noinst_HEADERS = gstputbits.h
|
||||
|
||||
CFLAGS += -Wall -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -7,7 +7,4 @@ libgstriff_la_SOURCES = gstriffparse.c gstriffencode.c gstriffutil.c
|
|||
libgstriffincludedir = $(includedir)/gst/libs/gstriff
|
||||
libgstriffinclude_HEADERS = gstriff.h
|
||||
|
||||
CFLAGS += -Wall -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -9,7 +9,4 @@ libgstvideoscaleinclude_HEADERS = gstvideoscale.h
|
|||
|
||||
noinst_HEADERS = yuv2rgb.h
|
||||
|
||||
CFLAGS += -Wall -O1 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += -O1 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ filterdir = $(libdir)/gst
|
|||
|
||||
filter_LTLIBRARIES = libwinloader.la
|
||||
|
||||
# compiler manages to screw something up here...
|
||||
# compiler manages to screw something up here... must reduce optimizations
|
||||
CFLAGS += -O2
|
||||
|
||||
libwinloader_la_SOURCES = driver.c elfdll.c ext.c externals.c module.c \
|
||||
|
|
@ -11,7 +11,4 @@ pe_image.c pe_resource.c registry.c resource.c stubs.s vfl.c afl.c
|
|||
noinst_HEADERS = externals.h wineacm.h
|
||||
|
||||
DEFINES=-rdynamic -fPIC -D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf
|
||||
CFLAGS += $(DEFINES)
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
CFLAGS += $(DEFINES)
|
||||
|
|
|
|||
|
|
@ -44,5 +44,5 @@ noinst_HEADERS = \
|
|||
|
||||
CFLAGS += -O2 -Wall
|
||||
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(GHTTP_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
libgstelements_la_LIBADD = $(GHTTP_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(GSTREAMER_LIBVERSION)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#noinst_PROGRAMS = basic m types a r plugin w s args mpg123 mcut push qtest
|
||||
# FIXME FIXME
|
||||
|
||||
noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
|
||||
mpeg2parse mp1parse mp3play ac3parse ac3play dvdcat fake cobin videotest \
|
||||
aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
|
||||
|
|
@ -6,9 +7,6 @@ noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
|
|||
|
||||
SUBDIRS = xml bindings
|
||||
|
||||
CFLAGS = -Wall $(shell gnome-config --cflags gnomeui)
|
||||
LDFLAGS = $(shell gnome-config --libs gnomeui)
|
||||
|
||||
buffer_SOURCES = buffer.c mem.c
|
||||
teardown_SOURCES = teardown.c mem.c
|
||||
ac3play_SOURCES = ac3play.c mem.c
|
||||
|
|
@ -21,16 +19,13 @@ else
|
|||
xvlibs=
|
||||
endif
|
||||
|
||||
LDADD = $(top_builddir)/gst/libgst.la \
|
||||
$(GLIB_LIBS) $(GTK_LIBS) \
|
||||
$(top_builddir)/plugins/videosink/gdkxvimage.lo ${xvlibs} -lXxf86vm
|
||||
LDADD = $(top_builddir)/plugins/videosink/gdkxvimage.lo ${xvlibs} -lXxf86vm
|
||||
|
||||
#LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \
|
||||
# $(top_builddir)/plugins/videosink/libvideosink.la -L/usr/X11/lib -lXxf86dga
|
||||
#LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \
|
||||
$(shell gnome-config --cflags gnomeui)
|
||||
LIBS += $(GNOME_LIBS) $(GST_LIBS)
|
||||
CFLAGS += $(GNOME_CFLAGS) $(GST_CFLAGS)
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
|
|
|||
|
|
@ -6,8 +6,5 @@ libcrashtest_la_SOURCES = \
|
|||
noinst_HEADERS = \
|
||||
dummy.h
|
||||
|
||||
CFLAGS = $(shell gnome-config --cflags gnomeui)
|
||||
LDFLAGS = $(shell gnome-config --libs gnomeui)
|
||||
|
||||
noinst_PROGRAMS = test
|
||||
test_LDADD = libcrashtest.la
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
noinst_PROGRAMS = readreg createreg
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
LDADD = $(GST_LIBS)
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
|
|
|||
|
|
@ -3,9 +3,8 @@ SUBDIRS = sched eos
|
|||
noinst_PROGRAMS = init loadall simplefake states caps queue registry \
|
||||
paranoia rip mp3encode autoplug props case4 markup load
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
CFLAGS = -Wall
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
# we have nothing but apps here, we can do this safely
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
noinst_PROGRAMS = case1
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
CFLAGS = -Wall
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
# jsut apps here, this is safe
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = autoplug
|
||||
|
||||
LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GNOME_CFLAGS)
|
||||
# just an app here, we're safe
|
||||
LIBS += $(GNOME_LIBS) $(GST_LIBS)
|
||||
CFLAGS += $(GNOME_CFLAGS) $(GST_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
noinst_PROGRAMS = helloworld
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = helloworld2
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,3 @@ noinst_LTLIBRARIES = libexample.la
|
|||
|
||||
libexample_la_SOURCES = example.c
|
||||
noinst_HEADERS = example.h
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
|
||||
libexample_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue2
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue3
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = queue4
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = thread
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
noinst_PROGRAMS = createxml runxml
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LIBS += $(GST_LIBS)
|
||||
CFLAGS += $(GST_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
noinst_PROGRAMS = runxml
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
CFLAGS = -Wall
|
||||
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
# nothing but apps here, this is safe
|
||||
LIBS = $(GST_LIBS)
|
||||
CFLAGS = $(GST_CFLAGS)
|
||||
|
|
|
|||
Loading…
Reference in a new issue