From b84badcf2d1c5b63cebf9834a1fb42cc7f554d08 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 11 Dec 2002 21:58:36 +0000 Subject: merge back from release branch Original commit message from CVS: merge back from release branch --- gst-libs/gst/audio/Makefile.am | 4 ++-- gst-libs/gst/idct/Makefile.am | 6 +++--- gst-libs/gst/resample/Makefile.am | 6 +++--- gst-libs/gst/riff/Makefile.am | 5 ++--- gst-libs/gst/video/Makefile.am | 5 ++--- 5 files changed, 12 insertions(+), 14 deletions(-) (limited to 'gst-libs/gst') diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 3d74dda3..e6efc8e2 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -4,8 +4,8 @@ library_LTLIBRARIES = libgstaudio.la libgstaudio_la_SOURCES = audio.c -# libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio -noinst_HEADERS = audio.h +libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio +libgstaudioinclude_HEADERS = audio.h libgstaudio_la_LIBADD = libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index 1f3b1227..bdf92d37 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -15,9 +15,9 @@ libgstidct_la_SOURCES = \ intidct.c \ $(GSTIDCTARCH_SRCS) -## libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct -## libgstidctinclude_HEADERS = idct.h -noinst_HEADERS = idct.h dct.h +libgstidctincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/idct +libgstidctinclude_HEADERS = idct.h +noinst_HEADERS = dct.h ## check_PROGRAMS = ieeetest diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 82abb56a..3c23638a 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -17,10 +17,10 @@ libgstresample_la_LIBADD = libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -#libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample -#libgstresampleinclude_HEADERS = resample.h +libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample +libgstresampleinclude_HEADERS = resample.h -noinst_HEADERS = private.h resample.h +noinst_HEADERS = private.h #check_PROGRAMS = test #test_SOURCES = test.c diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 0f7b8a72..4290948f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -4,9 +4,8 @@ library_LTLIBRARIES = libgstriff.la libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c riff.c -## libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff -## libgstriffinclude_HEADERS = riff.h -noinst_HEADERS = riff.h +libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff +libgstriffinclude_HEADERS = riff.h libgstriff_la_LIBADD = libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index a3c59341..3e6f9bd3 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -4,9 +4,8 @@ library_LTLIBRARIES = libgstvideo.la libgstvideo_la_SOURCES = video.c -#libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video -#libgstvideoinclude_HEADERS = video.h -noinst_HEADERS = video.h +libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video +libgstvideoinclude_HEADERS = video.h libgstvideo_la_LIBADD = libgstvideo_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math -- cgit v1.2.1