diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-10-26 10:54:12 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-10-26 11:13:20 -0700 |
| commit | 70807e8ff2265a74bbdfdf180f9fceff597a0540 (patch) | |
| tree | 770dbf0e326cfe1b8eb10feb7796251b0364e650 | |
| parent | 259407032af93cc861b3648780f7478921172572 (diff) | |
| download | bluez-70807e8ff2265a74bbdfdf180f9fceff597a0540.tar.gz | |
Makefile: Fix code style
Fix lines going over 80 columns.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.obexd | 3 | ||||
| -rw-r--r-- | 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 |