Conversation
kvh2xml.h is installed into the root of /usr/include, a namespace shared with every other package on the system. Give it a subdirectory: /usr/include/kvh2xml.h -> /usr/include/audioreach/kvh2xml.h Consumers need no source change. audioreach-graphmgr and audioreach-pal locate the header through PKG_CHECK_MODULES([KVH2XML], [kvh2xml]) and add @KVH2XML_CFLAGS@ to their compiler flags, so updating Cflags in kvh2xml.pc.in is sufficient for their plain #include "kvh2xml.h" to keep resolving. Note that /usr/include is in the default search path, so a consumer that neglected to use @KVH2XML_CFLAGS@ compiles today and will fail after this change. That is the intended outcome: such a consumer was relying on the header sitting in a global namespace. All three vendor variants are updated together, since each installs a same-named header to the same location. Also fix the Name field, which reads "k2h2xml" in all three files. pkg-config resolves modules by filename rather than by Name, so this is cosmetic. Signed-off-by: Ali Erdinc Koroglu <ali.koroglu@oss.qualcomm.com>
Every board generates and installs a pkg-config file named config.pc,
declaring Name: config, into $(libdir)/pkgconfig. Nothing consumes it.
audioreach-graphmgr checks for spf, kvh2xml, glib-2.0, gthread-2.0 and
dbus-1; audioreach-pal checks for agm, spf, kvh2xml, capiv2-api-headers,
audioroute, glib-2.0 and gthread-2.0. No project in the stack asks for
"config".
The contents describe an interface this package does not have. There is
no libconfig for Libs: -L${libdir} to find, and Cflags points at
${includedir}/acdbdata, a directory nothing installs.
The file also cannot work as written: all boards install to the same
$(libdir)/pkgconfig/config.pc, so building several leaves whichever was
installed last. Since the generated contents are identical for every
board and carry no board identity, the surviving copy would be
indistinguishable anyway.
Remove config.pc.in, the AC_CONFIG_FILES entries, and the install rules.
kvh2xml.pc is unaffected and remains the pkg-config interface for this
package.
Signed-off-by: Ali Erdinc Koroglu <ali.koroglu@oss.qualcomm.com>
|
We must be careful, as this is breaking API for consumers expecting to find But maybe this becomes irrelevant, as this header is proposed to be dropped (and shipped via mm-audio-headers instead): #95 |
|
In the meantime, it should possibly be moved to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two small cleanups.
1.
kvh2xml.h→/usr/include/audioreach/It currently lands in the root of
/usr/include. Consumers need no change:graphmgr and pal find it via
PKG_CHECK_MODULES([KVH2XML], [kvh2xml])and use@KVH2XML_CFLAGS@, so updatingCflagsinkvh2xml.pc.inis enough. Alsofixes the
Namefield, which readsk2h2xml.2. Remove the per-board
config.pcNothing consumes it, and it describes an interface that doesn't exist — no
libconfig, andCflagspoints at${includedir}/acdbdata, which nothinginstalls. All 13 boards also install it to the same path, so a full build
leaves exactly one file.
kvh2xml.pcis unaffected.