more changes

Original commit message from CVS:
more changes
This commit is contained in:
Thomas Vander Stichele 2001-12-23 18:12:12 +00:00
parent 7b61bb6f74
commit 9fe4587856
7 changed files with 13 additions and 17 deletions

View file

@ -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

View file

@ -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

View file

@ -21,7 +21,7 @@
*/
#include <gst/gst.h>
#include "gstbytestream.h"
#include <gst/bytestream/bytestream.h>
#define GST_TYPE_IDENTITY \
(gst_identity_get_type())

View file

@ -24,7 +24,7 @@
#include <stdlib.h>
#include <gst/gstinfo.h>
#include "gstbytestream.h"
#include <gst/bytestream/bytestream.h>
//#define BS_DEBUG

View file

@ -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

View file

@ -1,4 +1,4 @@
#include "gstgetbits.h"
#include <gst/getbits/getbits.h>
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);

View file

@ -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