External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make: split logging daemon build rules into logging/Makefile.inc.am

Browse Source 
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-02-21 18:05:56 +00:00
parent 3c1e95e6ff
commit efb021c8d8
2 changed files with 166 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/Makefile.am
View File

@ -90,11 +90,13 @@ UPSTART_FILES =
SYSCONF_FILES = SYSCONF_FILES =
sbin_PROGRAMS = sbin_PROGRAMS =
man8_MANS = man8_MANS =
DRIVER_SOURCES =
include conf/Makefile.inc.am include conf/Makefile.inc.am
include cpu/Makefile.inc.am include cpu/Makefile.inc.am
include security/Makefile.inc.am include security/Makefile.inc.am
include access/Makefile.inc.am include access/Makefile.inc.am
include logging/Makefile.inc.am
include uml/Makefile.inc.am include uml/Makefile.inc.am
include phyp/Makefile.inc.am include phyp/Makefile.inc.am
include test/Makefile.inc.am include test/Makefile.inc.am
@ -327,7 +329,7 @@ CLEANFILES += $(KEYMANS) $(KEYPODS)
# Internal generic driver infrastructure # Internal generic driver infrastructure
DATATYPES_SOURCES = datatypes.h datatypes.c DATATYPES_SOURCES = datatypes.h datatypes.c
DRIVER_SOURCES = \ DRIVER_SOURCES += \
driver.c driver.h \ driver.c driver.h \
driver-hypervisor.h \ driver-hypervisor.h \
driver-interface.h \ driver-interface.h \
@ -355,7 +357,6 @@ DRIVER_SOURCES = \
locking/lock_driver.h \ locking/lock_driver.h \
locking/lock_driver_nop.h locking/lock_driver_nop.c \ locking/lock_driver_nop.h locking/lock_driver_nop.c \
locking/domain_lock.h locking/domain_lock.c \ locking/domain_lock.h locking/domain_lock.c \
logging/log_manager.c logging/log_manager.h \
$(NULL) $(NULL)
LOCK_DRIVER_SANLOCK_SOURCES = \ LOCK_DRIVER_SANLOCK_SOURCES = \
@ -404,45 +405,6 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
$(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h
LOG_PROTOCOL_GENERATED = \
logging/log_protocol.h \
logging/log_protocol.c \
$(NULL)
DRIVER_SOURCES += $(LOG_PROTOCOL_GENERATED)
LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x
EXTRA_DIST += $(LOG_PROTOCOL) \
$(LOG_PROTOCOL_GENERATED)
BUILT_SOURCES += $(LOG_PROTOCOL_GENERATED)
MAINTAINERCLEANFILES += $(LOG_PROTOCOL_GENERATED)
LOG_DAEMON_GENERATED = \
logging/log_daemon_dispatch_stubs.h
$(NULL)
BUILT_SOURCES += $(LOG_DAEMON_GENERATED)
EXTRA_DIST += $(LOG_DAEMON_GENERATED)
MAINTAINERCLEANFILES += $(LOG_DAEMON_GENERATED)
LOG_DAEMON_SOURCES = \
logging/log_daemon.h \
logging/log_daemon.c \
logging/log_daemon_config.h \
logging/log_daemon_config.c \
logging/log_daemon_dispatch.c \
logging/log_daemon_dispatch.h \
logging/log_handler.c \
logging/log_handler.h \
$(NULL)
logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \
$(srcdir)/rpc/gendispatch.pl Makefile.am
$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \
virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \
$(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h
ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x
@ -735,8 +697,7 @@ check-local: check-augeas
check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \ check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \
check-augeas-sanlock \ check-augeas-sanlock \
check-augeas-lockd check-augeas-virtlockd \ check-augeas-lockd check-augeas-virtlockd
check-augeas-virtlogd
AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
@ -781,16 +742,6 @@ check-augeas-virtlockd: test_virtlockd.aug
'$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \
fi fi
test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< $@
check-augeas-virtlogd: test_virtlogd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
fi
# #
# Build our version script. This is composed of three parts: # Build our version script. This is composed of three parts:
# #
@ -1197,7 +1148,7 @@ locking/%-lockd.conf: $(srcdir)/locking/lockd.conf
cp $< $@ cp $< $@
sbin_PROGRAMS += virtlockd virtlogd sbin_PROGRAMS += virtlockd
virtlockd_SOURCES = \ virtlockd_SOURCES = \
$(LOCK_DAEMON_SOURCES) \ $(LOCK_DAEMON_SOURCES) \
@ -1227,42 +1178,14 @@ virtlockd_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
virtlogd_SOURCES = \
$(LOG_DAEMON_SOURCES) \
$(LOG_PROTOCOL_GENERATED) \
$(LOG_DAEMON_GENERATED) \
$(NULL)
virtlogd_CFLAGS = \
$(AM_CFLAGS) \
$(PIE_CFLAGS) \
$(XDR_CFLAGS) \
$(NULL)
virtlogd_LDFLAGS = \
$(AM_LDFLAGS) \
$(PIE_LDFLAGS) \
$(NO_UNDEFINED_LDFLAGS) \
$(NULL)
virtlogd_LDADD = \
libvirt_driver_admin.la \
libvirt-net-rpc-server.la \
libvirt-net-rpc.la \
libvirt_util.la \
../gnulib/lib/libgnu.la \
$(CYGWIN_EXTRA_LIBADD) \
$(NULL)
if WITH_DTRACE_PROBES
virtlogd_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES
else ! WITH_LIBVIRTD else ! WITH_LIBVIRTD
EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
$(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES)
$(LOG_DAEMON_SOURCES)
endif ! WITH_LIBVIRTD endif ! WITH_LIBVIRTD
SYSCONF_FILES += \ SYSCONF_FILES += \
locking/virtlockd.sysconf \ locking/virtlockd.sysconf \
logging/virtlogd.sysconf \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
@ -1291,7 +1214,6 @@ uninstall-sysconfig:
SYSVINIT_FILES_IN += \ SYSVINIT_FILES_IN += \
locking/virtlockd.init.in \ locking/virtlockd.init.in \
logging/virtlogd.init.in \
$(NULL) $(NULL)
SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%))
@ -1358,15 +1280,6 @@ virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
chmod a+x $@-t && \ chmod a+x $@-t && \
mv $@-t $@ mv $@-t $@
virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
< $< > $@-t && \
chmod a+x $@-t && \
mv $@-t $@
virtlockd.8.in: locking/virtlockd.pod virtlockd.8.in: locking/virtlockd.pod
$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
@ -1377,15 +1290,6 @@ virtlockd.8.in: locking/virtlockd.pod
rm -f $@-t1 && \ rm -f $@-t1 && \
mv $@-t2 $@ mv $@-t2 $@
virtlogd.8.in: logging/virtlogd.pod
$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
sed \
-e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
< $@-t1 > $@-t2 && \
rm -f $@-t1 && \
mv $@-t2 $@
%.8: %.8.in $(top_srcdir)/configure.ac %.8: %.8.in $(top_srcdir)/configure.ac
$(AM_V_GEN)sed \ $(AM_V_GEN)sed \
@ -1395,34 +1299,29 @@ virtlogd.8.in: logging/virtlogd.pod
mv $@-t $@ mv $@-t $@
if WITH_LIBVIRTD if WITH_LIBVIRTD
man8_MANS += virtlockd.8 virtlogd.8 man8_MANS += virtlockd.8
conf_DATA += locking/virtlockd.conf logging/virtlogd.conf conf_DATA += locking/virtlockd.conf
augeas_DATA += locking/virtlockd.aug logging/virtlogd.aug augeas_DATA += locking/virtlockd.aug
augeastest_DATA += test_virtlockd.aug test_virtlogd.aug augeastest_DATA += test_virtlockd.aug
endif WITH_LIBVIRTD endif WITH_LIBVIRTD
PODFILES += \ PODFILES += \
locking/virtlockd.pod \ locking/virtlockd.pod \
logging/virtlogd.pod \
$(NULL) $(NULL)
MANINFILES += \ MANINFILES += \
virtlockd.8.in \ virtlockd.8.in \
virtlogd.8.in \
$(NULL) $(NULL)
CLEANFILES += test_virtlockd.aug test_virtlogd.aug $(man8_MANS) CLEANFILES += test_virtlockd.aug $(man8_MANS)
MAINTAINERCLEANFILES += $(MANINFILES) MAINTAINERCLEANFILES += $(MANINFILES)
SYSTEMD_UNIT_FILES_IN += \ SYSTEMD_UNIT_FILES_IN += \
locking/virtlockd.service.in \ locking/virtlockd.service.in \
locking/virtlockd.socket.in \ locking/virtlockd.socket.in \
locking/virtlockd-admin.socket.in \ locking/virtlockd-admin.socket.in \
logging/virtlogd.service.in \
logging/virtlogd.socket.in \
logging/virtlogd-admin.socket.in \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
@ -1430,9 +1329,6 @@ EXTRA_DIST += \
locking/virtlockd.aug \ locking/virtlockd.aug \
locking/virtlockd.conf \ locking/virtlockd.conf \
locking/test_virtlockd.aug.in \ locking/test_virtlockd.aug.in \
logging/virtlogd.aug \
logging/virtlogd.conf \
logging/test_virtlogd.aug.in \
$(PODFILES) \ $(PODFILES) \
$(MANINFILES) \ $(MANINFILES) \
$(NULL) $(NULL)
@ -1485,24 +1381,6 @@ virtlockd-admin.socket: locking/virtlockd-admin.socket.in \
< $< > $@-t && \ < $< > $@-t && \
mv $@-t $@ mv $@-t $@
virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
< $< > $@-t && \
mv $@-t $@
virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
< $< > $@-t && \
mv $@-t $@
virtlogd-admin.socket: logging/virtlogd-admin.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
< $< > $@-t && \
mv $@-t $@
EXTRA_DIST += $(UPSTART_FILES) EXTRA_DIST += $(UPSTART_FILES)

155
src/logging/Makefile.inc.am Normal file
View File

@ -0,0 +1,155 @@
LOG_PROTOCOL_GENERATED = \
logging/log_protocol.h \
logging/log_protocol.c \
$(NULL)
LOG_DAEMON_GENERATED = \
logging/log_daemon_dispatch_stubs.h
$(NULL)
DRIVER_SOURCES += \
$(LOG_PROTOCOL_GENERATED) \
logging/log_manager.c \
logging/log_manager.h \
$(NULL)
LOG_DAEMON_SOURCES = \
logging/log_daemon.h \
logging/log_daemon.c \
logging/log_daemon_config.h \
logging/log_daemon_config.c \
logging/log_daemon_dispatch.c \
logging/log_daemon_dispatch.h \
logging/log_handler.c \
logging/log_handler.h \
$(NULL)
LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x
SYSVINIT_FILES_IN += logging/virtlogd.init.in
EXTRA_DIST += \
$(LOG_PROTOCOL) \
$(LOG_PROTOCOL_GENERATED) \
$(LOG_DAEMON_GENERATED) \
$(LOG_DAEMON_SOURCES) \
logging/virtlogd.aug \
logging/virtlogd.conf \
logging/test_virtlogd.aug.in \
$(NULL)
BUILT_SOURCES += \
$(LOG_PROTOCOL_GENERATED) \
$(LOG_DAEMON_GENERATED) \
$(NULL)
MAINTAINERCLEANFILES += \
$(LOG_PROTOCOL_GENERATED) \
$(LOG_DAEMON_GENERATED) \
$(NULL)
CLEANFILES += test_virtlogd.aug
PODFILES += logging/virtlogd.pod
MANINFILES += virtlogd.8.in
SYSCONF_FILES += logging/virtlogd.sysconf
SYSTEMD_UNIT_FILES_IN += \
logging/virtlogd.service.in \
logging/virtlogd.socket.in \
logging/virtlogd-admin.socket.in \
$(NULL)
if WITH_LIBVIRTD
sbin_PROGRAMS += virtlogd
man8_MANS += virtlogd.8
virtlogd_SOURCES = \
$(LOG_DAEMON_SOURCES) \
$(LOG_PROTOCOL_GENERATED) \
$(LOG_DAEMON_GENERATED) \
$(NULL)
virtlogd_CFLAGS = \
$(AM_CFLAGS) \
$(PIE_CFLAGS) \
$(XDR_CFLAGS) \
$(NULL)
virtlogd_LDFLAGS = \
$(AM_LDFLAGS) \
$(PIE_LDFLAGS) \
$(NO_UNDEFINED_LDFLAGS) \
$(NULL)
virtlogd_LDADD = \
libvirt_driver_admin.la \
libvirt-net-rpc-server.la \
libvirt-net-rpc.la \
libvirt_util.la \
../gnulib/lib/libgnu.la \
$(CYGWIN_EXTRA_LIBADD) \
$(NULL)
if WITH_DTRACE_PROBES
virtlogd_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES
conf_DATA += logging/virtlogd.conf
augeas_DATA += logging/virtlogd.aug
augeastest_DATA += test_virtlogd.aug
test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< $@
AUGEAS_DIRS += logging
check-augeas-logging: test_virtlogd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
'$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
fi
endif WITH_LIBVIRTD
.PHONY: check-augeas-logging
logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \
$(srcdir)/rpc/gendispatch.pl Makefile.am
$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \
virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \
$(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h
virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
< $< > $@-t && \
chmod a+x $@-t && \
mv $@-t $@
virtlogd.8.in: logging/virtlogd.pod
$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
sed \
-e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
< $@-t1 > $@-t2 && \
rm -f $@-t1 && \
mv $@-t2 $@
virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
< $< > $@-t && \
mv $@-t $@
virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
< $< > $@-t && \
mv $@-t $@
virtlogd-admin.socket: logging/virtlogd-admin.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
< $< > $@-t && \
mv $@-t $@