From 0741acca48f9064c039ddaea3f91f89d2a8cdbcc Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 5 Nov 2015 20:37:16 -0600 Subject: [PATCH] build: Make distcheck pass again --- ofono/Makefile.am | 15 ++++++++++----- ofono/drivers/rilmodem/rilutil.h | 6 +++--- ofono/drivers/rilmodem/sim.c | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ofono/Makefile.am b/ofono/Makefile.am index 56d9f644..901807e2 100644 --- a/ofono/Makefile.am +++ b/ofono/Makefile.am @@ -100,12 +100,12 @@ gisi_sources = gisi/client.c gisi/client.h gisi/common.h \ gril_sources = gril/gril.h gril/gril.c \ gril/grilio.h gril/grilio.c \ gril/grilutil.h gril/grilutil.c \ - gatchat/ringbuffer.h gatchat/ringbuffer.c \ - gril/gfunc.h gril/ril.h \ + gril/gfunc.h gril/gril.h \ gril/parcel.c gril/parcel.h \ gril/grilreply.c gril/grilreply.h \ gril/grilrequest.c gril/grilrequest.h \ - gril/grilunsol.c gril/grilunsol.h + gril/grilunsol.c gril/grilunsol.h \ + gril/ril_constants.h btio_sources = btio/btio.h btio/btio.c @@ -169,7 +169,7 @@ builtin_modules += rildev builtin_sources += plugins/rildev.c builtin_modules += ril -builtin_sources += plugins/ril.c +builtin_sources += plugins/ril.c plugins/ril.h builtin_modules += infineon builtin_sources += plugins/infineon.c @@ -181,8 +181,10 @@ builtin_sources += drivers/rilmodem/rilmodem.h \ drivers/rilmodem/devinfo.c \ drivers/rilmodem/network-registration.c \ drivers/rilmodem/voicecall.c \ + drivers/rilmodem/voicecall.h \ drivers/rilmodem/call-volume.c \ drivers/rilmodem/gprs.c \ + drivers/rilmodem/gprs.h \ drivers/rilmodem/gprs-context.c \ drivers/rilmodem/sim.c \ drivers/rilmodem/sms.c \ @@ -192,7 +194,9 @@ builtin_sources += drivers/rilmodem/rilmodem.h \ drivers/rilmodem/call-settings.c \ drivers/rilmodem/call-forwarding.c \ drivers/rilmodem/radio-settings.c \ - drivers/rilmodem/call-barring.c + drivers/rilmodem/radio-settings.h \ + drivers/rilmodem/call-barring.c \ + drivers/infineonmodem/infineon_constants.h endif endif @@ -886,6 +890,7 @@ if JOLLA_RILMODEM unit_test_rilmodem_cs_SOURCES = unit/test-rilmodem-cs.c $(gril_sources) \ src/log.c src/common.c src/util.c \ + gatchat/ringbuffer.h gatchat/ringbuffer.c \ drivers/rilmodem/call-settings.c \ src/simutil.c unit_test_rilmodem_cs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ diff --git a/ofono/drivers/rilmodem/rilutil.h b/ofono/drivers/rilmodem/rilutil.h index 25aed2eb..4efd36c3 100644 --- a/ofono/drivers/rilmodem/rilutil.h +++ b/ofono/drivers/rilmodem/rilutil.h @@ -23,9 +23,9 @@ #define RILUTIL_H #include -#include -#include -#include +#include +#include +#include /* TODO: create a table lookup*/ #define PREFIX_30_NETMASK "255.255.255.252" diff --git a/ofono/drivers/rilmodem/sim.c b/ofono/drivers/rilmodem/sim.c index 977a5751..f71bd0ad 100644 --- a/ofono/drivers/rilmodem/sim.c +++ b/ofono/drivers/rilmodem/sim.c @@ -52,7 +52,7 @@ #include "grilrequest.h" #include "grilunsol.h" -#include "drivers/infineonmodem/infineon_constants.h" +#include /* Number of passwords in EPINC response */ #define MTK_EPINC_NUM_PASSWD 4