Commit 714d8aa4 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

Move gstconfig.h back to normal include dir

Now that it's arch-independent again. Will need fixes in cerbero too.
parent 6ef60136
...@@ -35,8 +35,7 @@ DIST_SUBDIRS = parse printf ...@@ -35,8 +35,7 @@ DIST_SUBDIRS = parse printf
# make variables for all generated source and header files to make the # make variables for all generated source and header files to make the
# distinction clear # distinction clear
built_header_configure = gstversion.h built_headers_configure = gstversion.h gstconfig.h
built_sys_header_configure = gstconfig.h
built_header_make = gstenumtypes.h built_header_make = gstenumtypes.h
built_source_make = gstenumtypes.c built_source_make = gstenumtypes.c
...@@ -126,14 +125,13 @@ nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES = $(built_source_make) ...@@ -126,14 +125,13 @@ nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES = $(built_source_make)
# BUILT_SOURCES are built on make all/check/install before all other targets # BUILT_SOURCES are built on make all/check/install before all other targets
BUILT_SOURCES = \ BUILT_SOURCES = \
$(built_header_configure) \ $(built_headers_configure) \
$(built_sys_header_configure) \
$(built_header_make) \ $(built_header_make) \
$(built_source_make) $(built_source_make)
# CLEANFILES is for files generated by make # CLEANFILES is for files generated by make
CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
# DISTCLEANFILES is for files generated by configure # DISTCLEANFILES is for files generated by configure
DISTCLEANFILES = $(built_header_configure) $(built_sys_header_configure) DISTCLEANFILES = $(built_headers_configure)
libgstreamer_@GST_API_VERSION@_la_CFLAGS = \ libgstreamer_@GST_API_VERSION@_la_CFLAGS = \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
...@@ -232,10 +230,7 @@ gst_headers = \ ...@@ -232,10 +230,7 @@ gst_headers = \
libgstreamer_@GST_API_VERSION@include_HEADERS = $(gst_headers) math-compat.h libgstreamer_@GST_API_VERSION@include_HEADERS = $(gst_headers) math-compat.h
nodist_libgstreamer_@GST_API_VERSION@include_HEADERS = \ nodist_libgstreamer_@GST_API_VERSION@include_HEADERS = \
$(built_header_configure) $(built_header_make) $(built_headers_configure) $(built_header_make)
configexecincludedir = $(libdir)/gstreamer-@GST_API_VERSION@/include/gst
nodist_configexecinclude_HEADERS = $(built_sys_header_configure)
noinst_HEADERS = \ noinst_HEADERS = \
gettext.h \ gettext.h \
......
...@@ -17,4 +17,4 @@ Version: @VERSION@ ...@@ -17,4 +17,4 @@ Version: @VERSION@
Requires: glib-2.0, gobject-2.0 Requires: glib-2.0, gobject-2.0
Requires.private: gmodule-no-export-2.0 Requires.private: gmodule-no-export-2.0
Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@ Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include Cflags: -I${includedir}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment