From 89f894c19586dde24bde59c4418f698d675b07d4 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Mon, 21 Jun 2021 23:58:01 -0400
Subject: [PATCH] build: Add missing header to Autotools build.
* src/meson.build (libjami_dep): Sort headers.
* src/Makefile.am (nobase_include_HEADERS): Sort and add
'jami/conversation_interface.h'.
Change-Id: Ib66e4c9904906dcca4722cc81b6487aa43086e2e
---
src/Makefile.am | 24 +++++++++++++-----------
src/meson.build | 2 +-
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 06149b80c7..e6e1b7bf8c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -172,17 +172,19 @@ libring_la_SOURCES += \
winsyslog.c
endif
-nobase_include_HEADERS= dring/dring.h \
- dring/security_const.h \
- dring/callmanager_interface.h \
- dring/configurationmanager_interface.h \
- dring/presencemanager_interface.h \
- dring/datatransfer_interface.h \
- dring/account_const.h \
- dring/call_const.h \
- dring/presence_const.h \
- dring/media_const.h \
- dring/def.h
+nobase_include_HEADERS = \
+ dring/account_const.h \
+ dring/call_const.h \
+ dring/callmanager_interface.h \
+ dring/configurationmanager_interface.h \
+ dring/conversation_interface.h \
+ dring/datatransfer_interface.h \
+ dring/def.h \
+ dring/dring.h \
+ dring/media_const.h \
+ dring/presence_const.h \
+ dring/presencemanager_interface.h \
+ dring/security_const.h
if ENABLE_PLUGIN
nobase_include_HEADERS+= \
diff --git a/src/meson.build b/src/meson.build
index adc7052aa0..a99283cd72 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -312,8 +312,8 @@ if get_option('interfaces').contains('library')
'dring/call_const.h',
'dring/callmanager_interface.h',
'dring/configurationmanager_interface.h',
- 'dring/datatransfer_interface.h',
'dring/conversation_interface.h',
+ 'dring/datatransfer_interface.h',
'dring/def.h',
'dring/dring.h',
'dring/media_const.h',
--
GitLab