picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build-sys: move HAVE_MICROHTTPD HAVE_MYHOSTNAME to their own sections

This commit is contained in:
Kay Sievers 2013-01-30 18:01:23 +01:00
parent aa59024107
commit 4caf4ac142
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Makefile.am
View File

@ -644,21 +644,6 @@ MANPAGES_ALIAS = \
man/SD_JOURNAL_FOREACH_UNIQUE.3 \
man/sd_journal_get_catalog_for_message_id.3
if HAVE_MICROHTTPD
MANPAGES += \
man/systemd-journal-gatewayd.service.8
MANPAGES_ALIAS += \
man/systemd-journal-gatewayd.socket.8 \
man/systemd-journal-gatewayd.8
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
endif
if HAVE_MYHOSTNAME
MANPAGES += \
man/nss-myhostname.8
endif
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
@ -2883,8 +2868,8 @@ EXTRA_DIST += \
CLEANFILES += \
src/journal/journald-gperf.c
# ------------------------------------------------------------------------------
if HAVE_MICROHTTPD
gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
rootlibexec_PROGRAMS += \
@ -2917,6 +2902,13 @@ nodist_systemunit_DATA += \
dist_gatewayddocumentroot_DATA = \
src/journal/browse.html
MANPAGES += \
man/systemd-journal-gatewayd.service.8
MANPAGES_ALIAS += \
man/systemd-journal-gatewayd.socket.8 \
man/systemd-journal-gatewayd.8
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
endif
EXTRA_DIST += \
@ -3443,6 +3435,31 @@ polkitpolicy_in_files += \
EXTRA_DIST += \
units/systemd-timedated.service.in
# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/nss-myhostname.c \
src/nss-myhostname/ifconf.h \
src/nss-myhostname/netlink.c
libnss_myhostname_la_CFLAGS = \
$(AM_CFLAGS)
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
-export-dynamic \
-avoid-version \
-shared \
-shrext .so.2
lib_LTLIBRARIES += \
libnss_myhostname.la
MANPAGES += \
man/nss-myhostname.8
endif
# ------------------------------------------------------------------------------
if ENABLE_LOGIND
systemd_logind_SOURCES = \
@ -3601,27 +3618,7 @@ pamlib_LTLIBRARIES = \
pam_systemd.la
endif
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/nss-myhostname.c \
src/nss-myhostname/ifconf.h \
src/nss-myhostname/netlink.c
libnss_myhostname_la_CFLAGS = \
$(AM_CFLAGS)
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
-export-dynamic \
-avoid-version \
-shared \
-shrext .so.2
lib_LTLIBRARIES += \
libnss_myhostname.la
endif
# ------------------------------------------------------------------------------
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-login-install-hook:
libname=libsystemd-login.so && $(move-to-rootlibdir)