mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-27 16:36:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstconfig: Put gstconfig.h into $(libdir)/gstreamer-1.0/include

Browse source 
It's architecture dependent and should not be placed into the include
directory as the assumption is that all those headers are architecture
independent.

https://bugzilla.gnome.org/show_bug.cgi?id=739767
This commit is contained in:
Sebastian Dröge 2014-11-07 11:34:08 +01:00
parent 83905c9937
commit 444ceb0684
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/Makefile.am
View file

@ -41,7 +41,8 @@ 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 = gstconfig.h gstversion.h built_header_configure = gstversion.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,12 +127,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_header_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) DISTCLEANFILES = $(built_header_configure) $(built_sys_header_configure)
libgstreamer_@GST_API_VERSION@_la_CFLAGS = \ libgstreamer_@GST_API_VERSION@_la_CFLAGS = \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
@ -225,6 +227,9 @@ 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_header_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 \
glib-compat-private.h \ glib-compat-private.h \

2
pkgconfig/gstreamer.pc.in
View file

@ -15,4 +15,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} Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include