mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
configure.ac: reorganize clean up document more remove cruft
Original commit message from CVS: * configure.ac: reorganize clean up document more remove cruft * check/Makefile.am: * docs/gst/Makefile.am: * examples/helloworld/Makefile.am: * gst/Makefile.am: * gst/base/Makefile.am: * gst/check/Makefile.am: * gst/elements/Makefile.am: * gst/indexers/Makefile.am: * gst/parse/Makefile.am: * libs/gst/controller/Makefile.am: * libs/gst/dataprotocol/Makefile.am: * examples/helloworld/helloworld.c: (event_loop): compile fixes, though it's not being compiled currently
This commit is contained in:
parent
01ca7865c5
commit
08479555e5
18 changed files with 522 additions and 463 deletions
21
ChangeLog
21
ChangeLog
|
@ -1,3 +1,24 @@
|
||||||
|
2005-10-15 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
|
* configure.ac:
|
||||||
|
reorganize
|
||||||
|
clean up
|
||||||
|
document more
|
||||||
|
remove cruft
|
||||||
|
* check/Makefile.am:
|
||||||
|
* docs/gst/Makefile.am:
|
||||||
|
* examples/helloworld/Makefile.am:
|
||||||
|
* gst/Makefile.am:
|
||||||
|
* gst/base/Makefile.am:
|
||||||
|
* gst/check/Makefile.am:
|
||||||
|
* gst/elements/Makefile.am:
|
||||||
|
* gst/indexers/Makefile.am:
|
||||||
|
* gst/parse/Makefile.am:
|
||||||
|
* libs/gst/controller/Makefile.am:
|
||||||
|
* libs/gst/dataprotocol/Makefile.am:
|
||||||
|
* examples/helloworld/helloworld.c: (event_loop):
|
||||||
|
compile fixes, though it's not being compiled currently
|
||||||
|
|
||||||
2005-10-14 Tim-Philipp Müller <tim at centricular dot net>
|
2005-10-14 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* check/gst/gsttag.c: (test_date_tags), (gst_tag_suite):
|
* check/gst/gsttag.c: (test_date_tags), (gst_tag_suite):
|
||||||
|
|
|
@ -62,20 +62,20 @@ TESTS = $(check_PROGRAMS)
|
||||||
noinst_HEADERS = gst/capslist.h
|
noinst_HEADERS = gst/capslist.h
|
||||||
|
|
||||||
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
|
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
|
||||||
LDADD = $(GST_OBJ_LIBS) \
|
LDADD = $(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
$(GST_OBJ_LIBS) \
|
||||||
$(CHECK_LIBS)
|
$(CHECK_LIBS)
|
||||||
|
|
||||||
gst_libs_gdp_SOURCES = \
|
gst_libs_gdp_SOURCES = \
|
||||||
gst-libs/gdp.c \
|
gst-libs/gdp.c \
|
||||||
$(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
|
$(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
|
||||||
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
||||||
|
# FIXME: time to do this
|
||||||
gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
|
gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
|
||||||
|
|
||||||
gst_libs_controller_LDADD = $(GST_OBJ_LIBS) \
|
gst_libs_controller_LDADD = \
|
||||||
$(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
|
||||||
$(CHECK_LIBS) \
|
$(LDADD)
|
||||||
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la
|
|
||||||
|
|
||||||
# valgrind testing
|
# valgrind testing
|
||||||
# these just need valgrind fixing, period
|
# these just need valgrind fixing, period
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit a068fb101fd1fe5bcebc5e84bc12c6a3c58390fd
|
Subproject commit 507a4dc1d4fd6957ee8d62ca612a9a9054c271fc
|
903
configure.ac
903
configure.ac
File diff suppressed because it is too large
Load diff
|
@ -106,7 +106,7 @@ extra_files =
|
||||||
|
|
||||||
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
|
# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
|
||||||
# contains GtkObjects/GObjects and you want to document signals and properties.
|
# contains GtkObjects/GObjects and you want to document signals and properties.
|
||||||
GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir)
|
GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS)
|
GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS)
|
||||||
|
|
||||||
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
|
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
|
||||||
|
|
|
@ -5,18 +5,16 @@ static void
|
||||||
event_loop (GstElement * pipe)
|
event_loop (GstElement * pipe)
|
||||||
{
|
{
|
||||||
GstBus *bus;
|
GstBus *bus;
|
||||||
GstMessageType revent;
|
|
||||||
GstMessage *message = NULL;
|
GstMessage *message = NULL;
|
||||||
|
|
||||||
bus = gst_element_get_bus (GST_ELEMENT (pipe));
|
bus = gst_element_get_bus (GST_ELEMENT (pipe));
|
||||||
|
|
||||||
while (TRUE) {
|
while (TRUE) {
|
||||||
revent = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
|
message = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
|
||||||
|
|
||||||
message = gst_bus_pop (bus);
|
|
||||||
g_assert (message != NULL);
|
g_assert (message != NULL);
|
||||||
|
|
||||||
switch (revent) {
|
switch (message->type) {
|
||||||
case GST_MESSAGE_EOS:
|
case GST_MESSAGE_EOS:
|
||||||
gst_message_unref (message);
|
gst_message_unref (message);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -130,15 +130,21 @@ DISTCLEANFILES = $(built_header_configure)
|
||||||
|
|
||||||
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \
|
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \
|
||||||
-D_GNU_SOURCE \
|
-D_GNU_SOURCE \
|
||||||
$(GST_LIB_CFLAGS) \
|
|
||||||
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
|
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
|
||||||
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\"
|
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" \
|
||||||
|
-DGST_DISABLE_DEPRECATED \
|
||||||
|
$(VALGRIND_CFLAGS) \
|
||||||
|
$(GST_ALL_CFLAGS)
|
||||||
|
|
||||||
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
|
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
|
||||||
$(GST_LIB_LIBS) $(GST_PARSE_LA)
|
$(GST_PARSE_LA) \
|
||||||
|
$(VALGRIND_LIBS) \
|
||||||
|
$(GST_ALL_LIBS) \
|
||||||
|
$(XML_LIBS)
|
||||||
|
|
||||||
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \
|
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \
|
||||||
@GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ \
|
$(GST_LT_LDFLAGS) \
|
||||||
-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).* \
|
$(GST_ALL_LDFLAGS)
|
||||||
-no-undefined
|
|
||||||
|
|
||||||
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
|
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
gsttypefindhelper.c
|
gsttypefindhelper.c
|
||||||
|
|
||||||
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
|
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
../libgstreamer-@GST_MAJORMINOR@.la
|
|
||||||
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = \
|
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,9 @@ libgstelements_la_SOURCES = \
|
||||||
gsttypefindelement.c
|
gsttypefindelement.c
|
||||||
|
|
||||||
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
|
libgstelements_la_LIBADD = \
|
||||||
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
|
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
|
$(GST_OBJ_LIBS)
|
||||||
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstindexers.la
|
plugin_LTLIBRARIES = libgstindexers.la
|
||||||
|
|
||||||
# file index uses xml
|
# file index uses xml
|
||||||
|
@ -12,4 +11,3 @@ libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
||||||
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
|
# libgstparse.la is an optionally built helper library linked into core
|
||||||
noinst_LTLIBRARIES = libgstparse.la
|
noinst_LTLIBRARIES = libgstparse.la
|
||||||
|
|
||||||
|
|
||||||
CLEANFILES = grammar.tab.h grammar.output
|
CLEANFILES = grammar.tab.h grammar.output
|
||||||
EXTRA_DIST = grammar.y parse.l types.h
|
EXTRA_DIST = grammar.y parse.l types.h
|
||||||
|
|
||||||
|
@ -13,8 +12,8 @@ EXTRA_DIST = grammar.y parse.l types.h
|
||||||
nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
|
nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
|
||||||
CLEANFILES += grammar.tab.c lex._gst_parse_yy.c
|
CLEANFILES += grammar.tab.c lex._gst_parse_yy.c
|
||||||
|
|
||||||
libgstparse_la_CFLAGS = $(GST_LIB_CFLAGS) $(DISABLE_FLEX_WARNING)
|
libgstparse_la_CFLAGS = $(GST_ALL_CFLAGS)
|
||||||
libgstparse_la_LIBADD = $(GST_LIB_LIBS)
|
libgstparse_la_LIBADD = $(GST_ALL_LIBS)
|
||||||
|
|
||||||
noinst_HEADERS = grammar.tab.h
|
noinst_HEADERS = grammar.tab.h
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
gsttypefindhelper.c
|
gsttypefindhelper.c
|
||||||
|
|
||||||
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
|
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
../libgstreamer-@GST_MAJORMINOR@.la
|
|
||||||
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = \
|
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
gstinterpolation.c \
|
gstinterpolation.c \
|
||||||
gsthelper.c
|
gsthelper.c
|
||||||
|
|
||||||
libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs
|
libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LIB_LDFLAGS@ \
|
|
||||||
-no-undefined
|
|
||||||
libgstcontroller_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstcontroller_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
|
libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS)
|
||||||
|
|
|
@ -8,9 +8,8 @@ noinst_HEADERS = dp-private.h
|
||||||
libgstdataprotocol_@GST_MAJORMINOR@_la_SOURCES = \
|
libgstdataprotocol_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
dataprotocol.c
|
dataprotocol.c
|
||||||
|
|
||||||
|
# FIXME: do this now
|
||||||
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
||||||
libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs -DGST_ENABLE_NEW
|
libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -DGST_ENABLE_NEW
|
||||||
libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LIB_LDFLAGS@ \
|
|
||||||
-no-undefined
|
|
||||||
libgstdataprotocol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstdataprotocol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
|
libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS)
|
||||||
|
|
|
@ -21,9 +21,9 @@ libgstelements_la_SOURCES = \
|
||||||
gsttypefindelement.c
|
gsttypefindelement.c
|
||||||
|
|
||||||
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
|
libgstelements_la_LIBADD = \
|
||||||
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
|
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
|
$(GST_OBJ_LIBS)
|
||||||
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstindexers.la
|
plugin_LTLIBRARIES = libgstindexers.la
|
||||||
|
|
||||||
# file index uses xml
|
# file index uses xml
|
||||||
|
@ -12,4 +11,3 @@ libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
||||||
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -62,20 +62,20 @@ TESTS = $(check_PROGRAMS)
|
||||||
noinst_HEADERS = gst/capslist.h
|
noinst_HEADERS = gst/capslist.h
|
||||||
|
|
||||||
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
|
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
|
||||||
LDADD = $(GST_OBJ_LIBS) \
|
LDADD = $(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
$(GST_OBJ_LIBS) \
|
||||||
$(CHECK_LIBS)
|
$(CHECK_LIBS)
|
||||||
|
|
||||||
gst_libs_gdp_SOURCES = \
|
gst_libs_gdp_SOURCES = \
|
||||||
gst-libs/gdp.c \
|
gst-libs/gdp.c \
|
||||||
$(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
|
$(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
|
||||||
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
|
||||||
|
# FIXME: time to do this
|
||||||
gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
|
gst_libs_gdp_CFLAGS = $(AM_CFLAGS) -DGST_ENABLE_NEW
|
||||||
|
|
||||||
gst_libs_controller_LDADD = $(GST_OBJ_LIBS) \
|
gst_libs_controller_LDADD = \
|
||||||
$(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
|
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
|
||||||
$(CHECK_LIBS) \
|
$(LDADD)
|
||||||
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la
|
|
||||||
|
|
||||||
# valgrind testing
|
# valgrind testing
|
||||||
# these just need valgrind fixing, period
|
# these just need valgrind fixing, period
|
||||||
|
|
|
@ -5,18 +5,16 @@ static void
|
||||||
event_loop (GstElement * pipe)
|
event_loop (GstElement * pipe)
|
||||||
{
|
{
|
||||||
GstBus *bus;
|
GstBus *bus;
|
||||||
GstMessageType revent;
|
|
||||||
GstMessage *message = NULL;
|
GstMessage *message = NULL;
|
||||||
|
|
||||||
bus = gst_element_get_bus (GST_ELEMENT (pipe));
|
bus = gst_element_get_bus (GST_ELEMENT (pipe));
|
||||||
|
|
||||||
while (TRUE) {
|
while (TRUE) {
|
||||||
revent = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
|
message = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
|
||||||
|
|
||||||
message = gst_bus_pop (bus);
|
|
||||||
g_assert (message != NULL);
|
g_assert (message != NULL);
|
||||||
|
|
||||||
switch (revent) {
|
switch (message->type) {
|
||||||
case GST_MESSAGE_EOS:
|
case GST_MESSAGE_EOS:
|
||||||
gst_message_unref (message);
|
gst_message_unref (message);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue