All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH BlueZ 1/2] Makefile: Fix code style
@ 2021-10-26 18:18 Luiz Augusto von Dentz
  2021-10-26 18:18 ` [PATCH BlueZ 2/2] obexd: Add missing phonebook backends Luiz Augusto von Dentz
  2021-10-26 18:41 ` [BlueZ,1/2] Makefile: Fix code style bluez.test.bot
  0 siblings, 2 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2021-10-26 18:18 UTC (permalink / raw)
  To: linux-bluetooth

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Fix lines going over 80 columns.
---
 Makefile.am    |  3 ++-
 Makefile.obexd |  3 ++-
 configure.ac   | 20 ++++++++++++--------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9439588a..7985db090 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ pkgincludedir = $(includedir)/bluetooth
 
 pkginclude_HEADERS =
 
-AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(UDEV_CFLAGS) $(LIBEBOOK_CFLAGS) $(LIBEDATASERVER_CFLAGS) $(ell_cflags)
+AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(UDEV_CFLAGS) $(LIBEBOOK_CFLAGS) \
+				$(LIBEDATASERVER_CFLAGS) $(ell_cflags)
 AM_LDFLAGS = $(MISC_LDFLAGS)
 
 if DATAFILES
diff --git a/Makefile.obexd b/Makefile.obexd
index 2c0d19518..b9fbc9b3b 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -80,7 +80,8 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
 			obexd/src/map_ap.h
 obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
 			gdbus/libgdbus-internal.la \
-			$(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl
+			$(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \
+			$(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl
 
 obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
 
diff --git a/configure.ac b/configure.ac
index 0c0418452..0329095ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,7 +242,7 @@ AM_CONDITIONAL(MIDI, test "${enable_midi}" = "yes")
 
 if (test "${enable_midi}" = "yes"); then
 	PKG_CHECK_MODULES(ALSA, alsa, dummy=yes,
-				AC_MSG_ERROR(ALSA lib is required for MIDI support))
+			AC_MSG_ERROR(ALSA lib is required for MIDI support))
 	AC_SUBST(ALSA_CFLAGS)
 	AC_SUBST(ALSA_LIBS)
 fi
@@ -333,7 +333,8 @@ if (test "${enable_manpages}" != "no"); then
 	fi
 fi
 AM_CONDITIONAL(MANPAGES, test "${enable_manpages}" != "no")
-AM_CONDITIONAL(RUN_RST2MAN, test "${enable_manpages}" != "no" && test "${RST2MAN}" != "no")
+AM_CONDITIONAL(RUN_RST2MAN, test "${enable_manpages}" != "no" &&
+				test "${RST2MAN}" != "no")
 
 AC_ARG_ENABLE(testing, AC_HELP_STRING([--enable-testing],
 			[enable testing tools]),
@@ -405,14 +406,14 @@ AM_CONDITIONAL(ANDROID, test "${enable_android}" = "yes")
 
 if (test "${enable_android}" = "yes"); then
 	PKG_CHECK_MODULES(SBC, sbc >= 1.2, dummy=yes,
-					AC_MSG_ERROR(SBC library >= 1.2 is required))
+			AC_MSG_ERROR(SBC library >= 1.2 is required))
 	AC_SUBST(SBC_CFLAGS)
 	AC_SUBST(SBC_LIBS)
 fi
 
 if (test "${enable_android}" = "yes"); then
 	PKG_CHECK_MODULES(SPEEXDSP, speexdsp >= 1.2, dummy=yes,
-					AC_MSG_ERROR(SPEEXDSP library >= 1.2 is required))
+			AC_MSG_ERROR(SPEEXDSP library >= 1.2 is required))
 	AC_SUBST(SPEEXDSP_CFLAGS)
 	AC_SUBST(SPEEXDSP_LIBS)
 fi
@@ -421,17 +422,20 @@ AC_DEFINE_UNQUOTED(ANDROID_STORAGEDIR, "${storagedir}/android",
 			[Directory for the Android daemon storage files])
 
 AC_ARG_WITH([phonebook], AC_HELP_STRING([--with-phonebook=PLUGIN],
-				[obexd phonebook plugin (default=dummy)]),
-					[plugin_phonebook=${withval}])
+			[obexd phonebook plugin (default=dummy)]),
+			[plugin_phonebook=${withval}])
 if (test -z "${plugin_phonebook}"); then
 	plugin_phonebook=dummy
 fi
 
 if (test "${plugin_phonebook}" = "ebook"); then
-	PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 3.3], dummy=yes, AC_MSG_ERROR(libebook >= 3.3 is required))
+	PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 3.3], dummy=yes,
+			AC_MSG_ERROR(libebook >= 3.3 is required))
 	AC_SUBST(LIBEBOOK_CFLAGS)
 	AC_SUBST(LIBEBOOK_LIBS)
-	PKG_CHECK_MODULES(LIBEDATESERVER, [libedataserver-1.2 >= 3.3], dummy=yes, AC_MSG_ERROR(libedataserver >= 3.3 is required))
+	PKG_CHECK_MODULES(LIBEDATESERVER, [libedataserver-1.2 >= 3.3],
+			dummy=yes,
+			AC_MSG_ERROR(libedataserver >= 3.3 is required))
 	AC_SUBST(LIBEDATESERVER_CFLAGS)
 	AC_SUBST(LIBEDATESERVER_LIBS)
 fi
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-26 20:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-26 18:18 [PATCH BlueZ 1/2] Makefile: Fix code style Luiz Augusto von Dentz
2021-10-26 18:18 ` [PATCH BlueZ 2/2] obexd: Add missing phonebook backends Luiz Augusto von Dentz
2021-10-26 18:41 ` [BlueZ,1/2] Makefile: Fix code style bluez.test.bot
2021-10-26 20:27   ` Luiz Augusto von Dentz

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.