From ba3967bb53addc2b94de9c1ff2e5139f30b49d0d Mon Sep 17 00:00:00 2001 From: Pranav Mahesh Phansalkar Date: Mon, 21 Jul 2025 13:46:17 +0530 Subject: [PATCH 1/2] qmi-framework: Fix include paths and header installation behaviour - Replace relative include paths with absolute references to ensure compatibility with out-of-tree builds. - Removed wildcard usage in pkginclude_HEADERS and listed explicit header files to avoid automake errors. Signed-off-by: Pranav Mahesh Phansalkar --- Makefile.am | 10 +++++++++- common/Makefile.am | 4 ++-- qcci/Makefile.am | 6 +++--- qcsi/Makefile.am | 6 +++--- qencdec/Makefile.am | 2 +- tests/Makefile.am | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 17b88a0..b8fb5ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,14 @@ # SPDX-License-Identifier: BSD-3-Clause # Makefile.am - Automake script for QMI Framework +AM_CPPFLAGS = -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 -pkginclude_HEADERS = include/*.h +pkginclude_HEADERS = \ + include/common_v01.h \ + include/qcsi.h \ + include/qcsi_target_ext.h \ + include/qmi_cci_target_ext.h \ + include/qmi_client.h \ + include/qmi_idl_lib.h \ + include/qmi_idl_lib_internal.h SUBDIRS = common qencdec qcci qcsi tests diff --git a/common/Makefile.am b/common/Makefile.am index 7eb4447..7e777f2 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic AM_CPPFLAGS = \ - -I../include + -I$(top_srcdir)/include h_sources = qmi_common.h @@ -18,7 +18,7 @@ if GNU_CC requiredlibs = -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = common_v01.c diff --git a/qcci/Makefile.am b/qcci/Makefile.am index 18e7e0e..820cd91 100644 --- a/qcci/Makefile.am +++ b/qcci/Makefile.am @@ -12,8 +12,8 @@ AM_CFLAGS = -Wundef \ -DQMI_FW_SYSLOG AM_CPPFLAGS = \ - -I../include \ - -I../common/ \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/common/ \ -I$(top_builddir) \ $(QMI_CFLAGS) \ $(QMIFV_CFLAGS) @@ -36,7 +36,7 @@ requiredlibs += -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = qcci.c \ qcci_os.c \ diff --git a/qcsi/Makefile.am b/qcsi/Makefile.am index 2c5af26..2718a34 100644 --- a/qcsi/Makefile.am +++ b/qcsi/Makefile.am @@ -12,8 +12,8 @@ AM_CFLAGS = -Wundef \ -DQMI_FW_SYSLOG AM_CPPFLAGS = \ - -I../include \ - -I../common/ \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/common/ \ -I$(top_builddir) \ $(QMI_CFLAGS) \ $(QMIFV_CFLAGS) @@ -36,7 +36,7 @@ requiredlibs += -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = qcsi_common.c \ qcsi_os.c \ diff --git a/qencdec/Makefile.am b/qencdec/Makefile.am index 5850a27..c72b9ff 100644 --- a/qencdec/Makefile.am +++ b/qencdec/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic AM_CPPFLAGS = \ - -I../include + -I$(top_srcdir)/include h_sources = qmi_idl_lib_target.h diff --git a/tests/Makefile.am b/tests/Makefile.am index f2fa53d..162d684 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic \ $(QMI_CFLAGS) -AM_CPPFLAGS = -I../include -I../qcsi -I../common +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/qcsi -I$(top_srcdir)/common requiredlibs = ../qencdec/libqencdec.la ../common/libqmi_common.la ../qcci/libqcci.la ../qcsi/libqcsi.la From 838f505805ee6d2eaf85f51d5b7929bb072a4f05 Mon Sep 17 00:00:00 2001 From: Pranav Mahesh Phansalkar Date: Mon, 21 Jul 2025 13:46:17 +0530 Subject: [PATCH 2/2] qmi-framework: Fix include paths and header installation behaviour - Replace relative include paths with absolute references to ensure compatibility with out-of-tree builds. - Remove wildcard usage in pkginclude_HEADERS and list explicit header files to avoid automake errors. Signed-off-by: Pranav Mahesh Phansalkar --- Makefile.am | 10 +++++++++- common/Makefile.am | 4 ++-- qcci/Makefile.am | 6 +++--- qcsi/Makefile.am | 6 +++--- qencdec/Makefile.am | 2 +- tests/Makefile.am | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 17b88a0..b8fb5ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,14 @@ # SPDX-License-Identifier: BSD-3-Clause # Makefile.am - Automake script for QMI Framework +AM_CPPFLAGS = -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 -pkginclude_HEADERS = include/*.h +pkginclude_HEADERS = \ + include/common_v01.h \ + include/qcsi.h \ + include/qcsi_target_ext.h \ + include/qmi_cci_target_ext.h \ + include/qmi_client.h \ + include/qmi_idl_lib.h \ + include/qmi_idl_lib_internal.h SUBDIRS = common qencdec qcci qcsi tests diff --git a/common/Makefile.am b/common/Makefile.am index 7eb4447..7e777f2 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic AM_CPPFLAGS = \ - -I../include + -I$(top_srcdir)/include h_sources = qmi_common.h @@ -18,7 +18,7 @@ if GNU_CC requiredlibs = -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = common_v01.c diff --git a/qcci/Makefile.am b/qcci/Makefile.am index 18e7e0e..820cd91 100644 --- a/qcci/Makefile.am +++ b/qcci/Makefile.am @@ -12,8 +12,8 @@ AM_CFLAGS = -Wundef \ -DQMI_FW_SYSLOG AM_CPPFLAGS = \ - -I../include \ - -I../common/ \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/common/ \ -I$(top_builddir) \ $(QMI_CFLAGS) \ $(QMIFV_CFLAGS) @@ -36,7 +36,7 @@ requiredlibs += -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = qcci.c \ qcci_os.c \ diff --git a/qcsi/Makefile.am b/qcsi/Makefile.am index 2c5af26..2718a34 100644 --- a/qcsi/Makefile.am +++ b/qcsi/Makefile.am @@ -12,8 +12,8 @@ AM_CFLAGS = -Wundef \ -DQMI_FW_SYSLOG AM_CPPFLAGS = \ - -I../include \ - -I../common/ \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/common/ \ -I$(top_builddir) \ $(QMI_CFLAGS) \ $(QMIFV_CFLAGS) @@ -36,7 +36,7 @@ requiredlibs += -lpthread endif library_includedir = $(pkgincludedir) -library_include_HEADERS = $(h_sources) +noinst_HEADERS = $(h_sources) c_sources = qcsi_common.c \ qcsi_os.c \ diff --git a/qencdec/Makefile.am b/qencdec/Makefile.am index 5850a27..c72b9ff 100644 --- a/qencdec/Makefile.am +++ b/qencdec/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic AM_CPPFLAGS = \ - -I../include + -I$(top_srcdir)/include h_sources = qmi_idl_lib_target.h diff --git a/tests/Makefile.am b/tests/Makefile.am index f2fa53d..162d684 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,7 @@ AM_CFLAGS = -Wundef \ -fpic \ $(QMI_CFLAGS) -AM_CPPFLAGS = -I../include -I../qcsi -I../common +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/qcsi -I$(top_srcdir)/common requiredlibs = ../qencdec/libqencdec.la ../common/libqmi_common.la ../qcci/libqcci.la ../qcsi/libqcsi.la