summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-12-11 21:58:36 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-12-11 21:58:36 +0000
commitb84badcf2d1c5b63cebf9834a1fb42cc7f554d08 (patch)
tree3f2e4ff7dac807b72b76415fdb3d0266d5df154a /gst-libs/gst
parent69463fe7d8affa82851eb2be488dde332bfb1c46 (diff)
downloadgst-plugins-bad-b84badcf2d1c5b63cebf9834a1fb42cc7f554d08.tar.gz
gst-plugins-bad-b84badcf2d1c5b63cebf9834a1fb42cc7f554d08.tar.bz2
gst-plugins-bad-b84badcf2d1c5b63cebf9834a1fb42cc7f554d08.zip
merge back from release branch
Original commit message from CVS: merge back from release branch
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/audio/Makefile.am4
-rw-r--r--gst-libs/gst/idct/Makefile.am6
-rw-r--r--gst-libs/gst/resample/Makefile.am6
-rw-r--r--gst-libs/gst/riff/Makefile.am5
-rw-r--r--gst-libs/gst/video/Makefile.am5
5 files changed, 12 insertions, 14 deletions
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