From 9fe45878566c5a34bd279be5589d24b26580084c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 23 Dec 2001 18:12:12 +0000 Subject: [PATCH] more changes Original commit message from CVS: more changes --- configure.ac | 12 ++++-------- libs/gst/bytestream/Makefile.am | 4 ++-- libs/gst/bytestream/bstest.c | 2 +- libs/gst/bytestream/bytestream.c | 2 +- libs/gst/control/Makefile.am | 6 +++--- libs/gst/getbits/gstgetbits_generic.c | 2 +- test/Makefile.am | 2 +- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 27c78b8..753b362 100644 --- a/configure.ac +++ b/configure.ac @@ -1084,7 +1084,7 @@ AC_SUBST(LIBGST_CFLAGS) dnl Vars for everyone else GST_LIBS="\$(top_builddir)/gst/libgst.la $LIBGST_LIBS" -GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include $LIBGST_CFLAGS" +GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/libs -I\$(top_srcdir)/include $LIBGST_CFLAGS" AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) @@ -1128,13 +1128,9 @@ gst/schedulers/Makefile libs/Makefile libs/gst/Makefile libs/gst/bytestream/Makefile -libs/riff/Makefile -libs/getbits/Makefile -libs/putbits/Makefile -libs/idct/Makefile -libs/audio/Makefile -libs/control/Makefile -libs/resample/Makefile +libs/gst/getbits/Makefile +libs/gst/putbits/Makefile +libs/gst/control/Makefile plugins/Makefile plugins/a52dec/Makefile plugins/aasink/Makefile diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am index 3468201..5821bf6 100644 --- a/libs/gst/bytestream/Makefile.am +++ b/libs/gst/bytestream/Makefile.am @@ -1,6 +1,6 @@ -libdir = $(libdir)/gst +librarydir = $(libdir)/gst -lib_LTLIBRARIES = libgstbytestream.la libgstbstest.la +library_LTLIBRARIES = libgstbytestream.la libgstbstest.la libgstbytestream_la_SOURCES = bytestream.c libgstbstest_la_SOURCES = bstest.c diff --git a/libs/gst/bytestream/bstest.c b/libs/gst/bytestream/bstest.c index 087d63a..48d9297 100644 --- a/libs/gst/bytestream/bstest.c +++ b/libs/gst/bytestream/bstest.c @@ -21,7 +21,7 @@ */ #include -#include "gstbytestream.h" +#include #define GST_TYPE_IDENTITY \ (gst_identity_get_type()) diff --git a/libs/gst/bytestream/bytestream.c b/libs/gst/bytestream/bytestream.c index e5162ae..24ac4aa 100644 --- a/libs/gst/bytestream/bytestream.c +++ b/libs/gst/bytestream/bytestream.c @@ -24,7 +24,7 @@ #include #include -#include "gstbytestream.h" +#include //#define BS_DEBUG diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am index 026fe8d..bddc68f 100644 --- a/libs/gst/control/Makefile.am +++ b/libs/gst/control/Makefile.am @@ -1,6 +1,6 @@ -libdir = $(libdir)/gst +librarydir = $(libdir)/gst -lib_LTLIBRARIES = libgstcontrol.la +library_LTLIBRARIES = libgstcontrol.la libgstcontrol_la_SOURCES = \ control.c \ @@ -15,7 +15,7 @@ libgstcontrolinclude_HEADERS = \ dparammanager.h \ dparam.h \ dparamcommon.h \ - plinearinterp.h + dplinearinterp.h libgstcontrol_la_LIBADD = $(GST_LIBS) libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math diff --git a/libs/gst/getbits/gstgetbits_generic.c b/libs/gst/getbits/gstgetbits_generic.c index 4e39ad9..eb97682 100644 --- a/libs/gst/getbits/gstgetbits_generic.c +++ b/libs/gst/getbits/gstgetbits_generic.c @@ -1,4 +1,4 @@ -#include "gstgetbits.h" +#include unsigned long _gst_getbits_int_cb(gst_getbits_t *gb, unsigned long bits); unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits); diff --git a/test/Makefile.am b/test/Makefile.am index 12c162a..70d71e3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,7 +7,7 @@ GNOME_PROGS = spectrum wave mp1parse videotest aviparse \ videotest2 video2mp1 dvshow dv2mp1 \ mpeg2parse2 mpeg2parse3 \ mp2tomp1v2 main sinesliders testspeed dvdplay testpod -sinesliders_LDADD = ../libs/control/libgstcontrol.la +sinesliders_LDADD = ../libs/gst/control/libgstcontrol.la else GNOME_PROGS = endif -- 2.7.4