[systemd-devel] [PATCH] build: add option to disable hwdb

[Michael Biebl]

That said, Makefile-man.am contains a comment, that this file
shouldn't be edited directly but rather be updated via "make
update-man-list"

2014-12-19 15:12 GMT+01:00 Michael Biebl <mbiebl at gmail.com>:
> +if ENABLE_HWDB
> +MANPAGES += \
> +        man/hwdb.7
> +        man/systemd-hwdb.xml
>
> Shouldn't this rather be systemd-hwdb.8 ?
>
> I also don't see a reason to remove man/systemd-hwdb.xml from EXTRA_DIST.
> You want to include that file in the dist tarball always.
>
> 2014-12-19 13:25 GMT+01:00 Tom Gundersen <teg at jklm.no>:
>> Hm, this broke the manpage building:
>>
>> $ ./autogen.sh c && make man/systemd-hwdb.8
>> [...]
>> make: *** No rule to make target 'man/systemd-hwdb.xml', needed by
>> 'man/systemd-hwdb.8'.  Stop.
>>
>> Care to take a look?
>>
>> Cheers,
>>
>> Tom
>>
>> On Fri, Dec 19, 2014 at 11:47 AM, Umut Tezduyar Lindskog
>> <umut.tezduyar at axis.com> wrote:
>>> ---
>>>  Makefile-man.am | 9 ++++++---
>>>  Makefile.am     | 2 ++
>>>  configure.ac    | 6 ++++++
>>>  3 files changed, 14 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/Makefile-man.am b/Makefile-man.am
>>> index 45b8238..c6506aa 100644
>>> --- a/Makefile-man.am
>>> +++ b/Makefile-man.am
>>> @@ -14,7 +14,6 @@ MANPAGES += \
>>>         man/file-hierarchy.7 \
>>>         man/halt.8 \
>>>         man/hostname.5 \
>>> -       man/hwdb.7 \
>>>         man/journalctl.1 \
>>>         man/journald.conf.5 \
>>>         man/kernel-command-line.7 \
>>> @@ -73,7 +72,6 @@ MANPAGES += \
>>>         man/systemd-halt.service.8 \
>>>         man/systemd-hibernate-resume-generator.8 \
>>>         man/systemd-hibernate-resume at .service.8 \
>>> -       man/systemd-hwdb.8 \
>>>         man/systemd-inhibit.1 \
>>>         man/systemd-initctl.service.8 \
>>>         man/systemd-journald.service.8 \
>>> @@ -676,6 +674,12 @@ man/systemd-user.conf.html: man/systemd-system.conf.html
>>>  man/user.conf.d.html: man/systemd-system.conf.html
>>>         $(html-alias)
>>>
>>> +if ENABLE_HWDB
>>> +MANPAGES += \
>>> +        man/hwdb.7 \
>>> +        man/systemd-hwdb.xml
>>> +
>>> +endif
>>>
>>>  if ENABLE_BACKLIGHT
>>>  MANPAGES += \
>>> @@ -1705,7 +1709,6 @@ EXTRA_DIST += \
>>>         man/systemd-hibernate-resume-generator.xml \
>>>         man/systemd-hibernate-resume at .service.xml \
>>>         man/systemd-hostnamed.service.xml \
>>> -       man/systemd-hwdb.xml \
>>>         man/systemd-inhibit.xml \
>>>         man/systemd-initctl.service.xml \
>>>         man/systemd-journal-gatewayd.service.xml \
>>> diff --git a/Makefile.am b/Makefile.am
>>> index a7a2b6d..8489a6b 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -3607,6 +3607,7 @@ udevadm_LDADD = \
>>>         libudev-core.la
>>>
>>>  # ------------------------------------------------------------------------------
>>> +if ENABLE_HWDB
>>>  INSTALL_DIRS += \
>>>         $(sysconfdir)/udev/hwdb.d
>>>
>>> @@ -3655,6 +3656,7 @@ INSTALL_DATA_HOOKS += \
>>>
>>>  hwdb-remove-hook:
>>>         -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
>>> +endif
>>>
>>>  # ------------------------------------------------------------------------------
>>>  TESTS += \
>>> diff --git a/configure.ac b/configure.ac
>>> index 90aa3cc..9296c25 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -1191,6 +1191,11 @@ AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
>>>  AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
>>>
>>>  # ------------------------------------------------------------------------------
>>> +AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
>>> +       enable_hwdb=$enableval, enable_hwdb=yes)
>>> +AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
>>> +
>>> +# ------------------------------------------------------------------------------
>>>  have_manpages=no
>>>  AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
>>>  AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
>>> @@ -1430,6 +1435,7 @@ AC_MSG_RESULT([
>>>          dbus:                    ${have_dbus}
>>>          nss-myhostname:          ${have_myhostname}
>>>          gudev:                   ${enable_gudev}
>>> +        hwdb:                    ${enable_hwdb}
>>>          gintrospection:          ${enable_introspection}
>>>          terminal:                ${have_terminal}
>>>          kdbus:                   ${have_kdbus}
>>> --
>>> 2.1.1
>>>
>>> _______________________________________________
>>> systemd-devel mailing list
>>> systemd-devel at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
>> _______________________________________________
>> systemd-devel mailing list
>> systemd-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
>
>
>
> --
> Why is it that all of the instruments seeking intelligent life in the
> universe are pointed away from Earth?



-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?