Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix to make the pkgconfig provide comprehensive include paths

  • Loading branch information...
commit d128a1a34a4008892c2d004d6284742683115aec 1 parent 4209647
@mmontero mmontero authored
View
13 Makefile.am
@@ -13,7 +13,7 @@ pkgconfig_DATA = libOMX_Core.pc
EXTRA_DIST = libOMX_Core.pc.in linker.script.in
-BUILT_SOURCES = linker.script
+BUILT_SOURCES = linker.script libOMX_Core.pc
linker.script: $(srcdir)/linker.script.in
sed -e "s?@OMX_INSTALL_DIR@?$(OMX_INSTALL_DIR)?" \
@@ -24,5 +24,16 @@ linker.script: $(srcdir)/linker.script.in
-e "s?@LINUXUTILS_INSTALL_DIR@?$(LINUXUTILS_INSTALL_DIR)?" \
$< > $@
+libOMX_Core.pc: $(srcdir)/libOMX_Core.pc.in
+ sed -e "s?@&prefix@?@prefix@?" \
+ -e "s?@&exec_prefix@?@exec_prefix@?" \
+ -e "s?@&libdir@?@libdir@?" \
+ -e "s?@&VERSION@?@VERSION@?" \
+ -e "s?@&OMXVERSION@?@OMXVERSION@?" \
+ -e "s?@OMX_INSTALL_DIR@?$(OMX_INSTALL_DIR)?" \
+ -e "s?@XDC_INSTALL_DIR@?$(XDC_INSTALL_DIR)?" \
+ -e "s?@KERNEL_INSTALL_DIR@?$(KERNEL_INSTALL_DIR)?g" \
+ $< > $@
+
clean-local:
rm -f linker.script
View
21 Makefile.in
@@ -38,8 +38,8 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/libOMX_Core.pc.in $(top_srcdir)/configure \
- config.guess config.sub depcomp install-sh ltmain.sh missing
+ $(top_srcdir)/configure config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -48,7 +48,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libOMX_Core.pc
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -249,7 +249,7 @@ libOMX_Core_la_LDFLAGS = -version-info 1:0:0 \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libOMX_Core.pc
EXTRA_DIST = libOMX_Core.pc.in linker.script.in
-BUILT_SOURCES = linker.script
+BUILT_SOURCES = linker.script libOMX_Core.pc
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -306,8 +306,6 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-libOMX_Core.pc: $(top_builddir)/config.status $(srcdir)/libOMX_Core.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@@ -742,6 +740,17 @@ linker.script: $(srcdir)/linker.script.in
-e "s?@LINUXUTILS_INSTALL_DIR@?$(LINUXUTILS_INSTALL_DIR)?" \
$< > $@
+libOMX_Core.pc: $(srcdir)/libOMX_Core.pc.in
+ sed -e "s?@&prefix@?@prefix@?" \
+ -e "s?@&exec_prefix@?@exec_prefix@?" \
+ -e "s?@&libdir@?@libdir@?" \
+ -e "s?@&VERSION@?@VERSION@?" \
+ -e "s?@&OMXVERSION@?@OMXVERSION@?" \
+ -e "s?@OMX_INSTALL_DIR@?$(OMX_INSTALL_DIR)?" \
+ -e "s?@XDC_INSTALL_DIR@?$(XDC_INSTALL_DIR)?" \
+ -e "s?@KERNEL_INSTALL_DIR@?$(KERNEL_INSTALL_DIR)?g" \
+ $< > $@
+
clean-local:
rm -f linker.script
View
3  configure
@@ -10498,7 +10498,7 @@ OMXVERSION=`basename $EZSDKDIR/component-sources/omx_* | sed "s/omx_//"`
OMXVERSION=$OMXVERSION
-ac_config_files="$ac_config_files Makefile libOMX_Core.pc"
+ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -11493,7 +11493,6 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "libOMX_Core.pc") CONFIG_FILES="$CONFIG_FILES libOMX_Core.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
View
2  configure.ac
@@ -32,5 +32,5 @@ fi
OMXVERSION=`basename $EZSDKDIR/component-sources/omx_* | sed "s/omx_//"`
AC_SUBST(OMXVERSION,$OMXVERSION)
-AC_CONFIG_FILES([Makefile libOMX_Core.pc])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
View
22 libOMX_Core.pc.in
@@ -1,10 +1,20 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-omxversion=@OMXVERSION@
+prefix=@&prefix@
+exec_prefix=@&exec_prefix@
+libdir=@&libdir@
+omxversion=@&OMXVERSION@
Name: OMX Core
Description: OMX Components for DM81xx
-Version: @VERSION@
+Version: @&VERSION@
Libs: -L${libdir} -lOMX_Core
-Cflags: -I@EZSDKDIR@/component-sources/omx_${omxversion}/include/
+Cflags: -Dxdc_target_name__=GCArmv5T -Dxdc_target_types__=gnu/targets/arm/std.h -Dxdc__RESTRICT__ \
+-I@OMX_INSTALL_DIR@/include/openMaxv11 \
+-I@OMX_INSTALL_DIR@/packages \
+-I@OMX_INSTALL_DIR@/include \
+-I@OMX_INSTALL_DIR@/packages/ti/omx/comp/ctrl \
+-I@OMX_INSTALL_DIR@/packages/ti/omx/interfaces/openMaxv11 \
+-I@OMX_INSTALL_DIR@/packages/ti/omx/comp/vfpc \
+-I@OMX_INSTALL_DIR@/packages/ti/omx/comp/vfdc \
+-I@OMX_INSTALL_DIR@/packages/ti/omx/comp/ctrl
+-I@KERNEL_INSTALL_DIR@/include -I@KERNEL_INSTALL_DIR@/arch/arm/include \
+-I@XDC_INSTALL_DIR@/packages
Please sign in to comment.
Something went wrong with that request. Please try again.