summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2016-08-13 13:55:15 +0100
committerTim-Philipp Müller <tim@centricular.com>2016-08-13 13:55:15 +0100
commit714d8aa45118428461f6de8a4d3cafcd53ae884d (patch)
treef0f624f0ffceaeae5ff70ede89737920a5241c37
parent6ef601367e0f5adb7a8b02cec94dec04fccf701a (diff)
Move gstconfig.h back to normal include dir
Now that it's arch-independent again. Will need fixes in cerbero too.
-rw-r--r--gst/Makefile.am13
-rw-r--r--pkgconfig/gstreamer.pc.in2
2 files changed, 5 insertions, 10 deletions
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 0e0c78fc63..4fe947a624 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -35,8 +35,7 @@ DIST_SUBDIRS = parse printf
# make variables for all generated source and header files to make the
# distinction clear
-built_header_configure = gstversion.h
-built_sys_header_configure = gstconfig.h
+built_headers_configure = gstversion.h gstconfig.h
built_header_make = gstenumtypes.h
built_source_make = gstenumtypes.c
@@ -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 = \
- $(built_header_configure) \
- $(built_sys_header_configure) \
+ $(built_headers_configure) \
$(built_header_make) \
$(built_source_make)
# CLEANFILES is for files generated by make
CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
# 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 = \
-D_GNU_SOURCE \
@@ -232,10 +230,7 @@ gst_headers = \
libgstreamer_@GST_API_VERSION@include_HEADERS = $(gst_headers) math-compat.h
nodist_libgstreamer_@GST_API_VERSION@include_HEADERS = \
- $(built_header_configure) $(built_header_make)
-
-configexecincludedir = $(libdir)/gstreamer-@GST_API_VERSION@/include/gst
-nodist_configexecinclude_HEADERS = $(built_sys_header_configure)
+ $(built_headers_configure) $(built_header_make)
noinst_HEADERS = \
gettext.h \
diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in
index 381c96d70a..78b8aa9de1 100644
--- a/pkgconfig/gstreamer.pc.in
+++ b/pkgconfig/gstreamer.pc.in
@@ -17,4 +17,4 @@ Version: @VERSION@
Requires: glib-2.0, gobject-2.0
Requires.private: gmodule-no-export-2.0
Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include
+Cflags: -I${includedir}