X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e90e9c322e2b38a2819135a14636fede90ce7f60;hb=d33e31f8451d566713a7f32796ad857321b59eb9;hp=789e4420f3023be30903d1ca051bb47ad65c875e;hpb=78b2e3a632748fbeae8a9eb70ab1940e4a70619a;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 789e4420f..e90e9c322 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,7 @@ INSTALL_DATA_HOOKS =
 DISTCHECK_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
+noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
@@ -473,14 +474,85 @@ EXTRA_DIST += \
 
 @INTLTOOL_POLICY_RULE@
 
-noinst_LTLIBRARIES = \
-	libsystemd-basic.la \
-	libsystemd-capability.la \
-	libsystemd-audit.la \
-	libsystemd-acl.la \
-	libsystemd-core.la
+# ------------------------------------------------------------------------------
+MANPAGES = \
+	man/systemd.1 \
+	man/systemctl.1 \
+	man/systemd-cgls.1 \
+	man/systemd-cgtop.1 \
+	man/systemd-nspawn.1 \
+	man/systemd-tmpfiles.8 \
+	man/systemd-notify.1 \
+	man/systemd.unit.5 \
+	man/systemd.service.5 \
+	man/systemd.socket.5 \
+	man/systemd.mount.5 \
+	man/systemd.automount.5 \
+	man/systemd.swap.5 \
+	man/systemd.timer.5 \
+	man/systemd.path.5 \
+	man/systemd.target.5 \
+	man/systemd.device.5 \
+	man/systemd.snapshot.5 \
+	man/systemd.exec.5 \
+	man/systemd.special.7 \
+	man/systemd.journal-fields.7 \
+	man/daemon.7 \
+	man/runlevel.8 \
+	man/telinit.8 \
+	man/halt.8 \
+	man/shutdown.8 \
+	man/pam_systemd.8 \
+	man/systemd.conf.5 \
+	man/tmpfiles.d.5 \
+	man/hostname.5 \
+	man/timezone.5 \
+	man/machine-id.5 \
+	man/locale.conf.5 \
+	man/os-release.5 \
+	man/machine-info.5 \
+	man/modules-load.d.5 \
+	man/sysctl.d.5 \
+	man/systemd-ask-password.1 \
+	man/systemd-cat.1 \
+	man/systemd-machine-id-setup.1 \
+	man/journald.conf.5 \
+	man/journalctl.1 \
+	man/udev.7 \
+	man/udevadm.8 \
+	man/udevd.8
+
+MANPAGES_ALIAS = \
+	man/reboot.8 \
+	man/poweroff.8 \
+	man/init.1
+
+man/reboot.8: man/halt.8
+man/poweroff.8: man/halt.8
+man/init.1: man/systemd.1
+
+XML_FILES = \
+	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
+if ENABLE_MANPAGES
+man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+noinst_DATA = \
+	${XML_FILES:.xml=.html}
+endif
+
+EXTRA_DIST += \
+	$(XML_FILES) \
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-basic.la
+
 libsystemd_basic_la_SOURCES = \
 	src/shared/util.c \
 	src/shared/util.h \
@@ -516,6 +588,9 @@ libsystemd_basic_la_LIBADD = \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-capability.la
+
 libsystemd_capability_la_SOURCES = \
 	src/shared/capability.c \
 	src/shared/capability.h
@@ -528,6 +603,9 @@ libsystemd_capability_la_LIBADD = \
 	$(CAP_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-audit.la
+
 libsystemd_audit_la_SOURCES = \
 	src/shared/audit.c \
 	src/shared/audit.h
@@ -536,6 +614,9 @@ libsystemd_audit_la_LIBADD = \
 	libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-acl.la
+
 libsystemd_acl_la_SOURCES = \
 	src/shared/acl.c \
 	src/shared/acl.h
@@ -548,6 +629,9 @@ libsystemd_acl_la_LIBADD = \
 	$(ACL_LIBS)
 
 # ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-core.la
+
 libsystemd_core_la_SOURCES = \
 	src/unit.c \
 	src/unit.h \
@@ -706,81 +790,6 @@ libsystemd_core_la_LIBADD = \
 	$(CAP_LIBS) \
 	$(KMOD_LIBS)
 
-# ------------------------------------------------------------------------------
-MANPAGES = \
-	man/systemd.1 \
-	man/systemctl.1 \
-	man/systemd-cgls.1 \
-	man/systemd-cgtop.1 \
-	man/systemd-nspawn.1 \
-	man/systemd-tmpfiles.8 \
-	man/systemd-notify.1 \
-	man/systemd.unit.5 \
-	man/systemd.service.5 \
-	man/systemd.socket.5 \
-	man/systemd.mount.5 \
-	man/systemd.automount.5 \
-	man/systemd.swap.5 \
-	man/systemd.timer.5 \
-	man/systemd.path.5 \
-	man/systemd.target.5 \
-	man/systemd.device.5 \
-	man/systemd.snapshot.5 \
-	man/systemd.exec.5 \
-	man/systemd.special.7 \
-        man/systemd.journal-fields.7 \
-	man/daemon.7 \
-	man/runlevel.8 \
-	man/telinit.8 \
-	man/halt.8 \
-	man/shutdown.8 \
-	man/pam_systemd.8 \
-	man/systemd.conf.5 \
-	man/tmpfiles.d.5 \
-	man/hostname.5 \
-	man/timezone.5 \
-	man/machine-id.5 \
-	man/locale.conf.5 \
-	man/os-release.5 \
-	man/machine-info.5 \
-	man/modules-load.d.5 \
-	man/sysctl.d.5 \
-	man/systemd-ask-password.1 \
-	man/systemd-cat.1 \
-	man/systemd-machine-id-setup.1 \
-	man/journald.conf.5 \
-	man/journalctl.1 \
-	man/udev.7 \
-	man/udevadm.8 \
-	man/udevd.8
-
-MANPAGES_ALIAS = \
-	man/reboot.8 \
-	man/poweroff.8 \
-	man/init.1
-
-man/reboot.8: man/halt.8
-man/poweroff.8: man/halt.8
-man/init.1: man/systemd.1
-
-XML_FILES = \
-	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-
-if ENABLE_MANPAGES
-man_MANS = \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
-
-noinst_DATA = \
-	${XML_FILES:.xml=.html}
-endif
-
-EXTRA_DIST += \
-	$(XML_FILES) \
-	${XML_FILES:.xml=.html} \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
-
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
 	src/main.c
@@ -796,20 +805,28 @@ systemd_LDADD = \
 test_engine_SOURCES = \
 	src/test-engine.c
 
-test_engine_CFLAGS = $(systemd_CFLAGS)
-test_engine_LDADD = $(systemd_LDADD)
+test_engine_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_engine_LDADD = \
+	libsystemd-core.la
 
 test_job_type_SOURCES = \
 	src/test-job-type.c
 
-test_job_type_CFLAGS = $(systemd_CFLAGS)
-test_job_type_LDADD = $(systemd_LDADD)
+test_job_type_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_job_type_LDADD = \
+	libsystemd-core.la
 
 test_ns_SOURCES = \
 	src/test-ns.c
 
-test_ns_CFLAGS = $(systemd_CFLAGS)
-test_ns_LDADD = $(systemd_LDADD)
+test_ns_LDADD = \
+	libsystemd-core.la
 
 test_loopback_SOURCES = \
 	src/test-loopback.c \
@@ -866,9 +883,9 @@ test_install_LDADD = \
 	libsystemd-basic.la
 
 test_watchdog_SOURCES = \
-        src/test-watchdog.c \
+	src/test-watchdog.c \
 	src/watchdog.c \
-        src/watchdog.h
+	src/watchdog.h
 
 test_watchdog_LDADD = \
 	libsystemd-basic.la
@@ -908,9 +925,6 @@ systemd_shutdownd_SOURCES = \
 	src/utmp-wtmp.c \
 	src/shutdownd.c
 
-systemd_shutdownd_CFLAGS = \
-	$(AM_CFLAGS)
-
 systemd_shutdownd_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la
@@ -919,8 +933,8 @@ systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
 	src/shutdown.c \
-        src/watchdog.c \
-        src/watchdog.h
+	src/watchdog.c \
+	src/watchdog.h
 
 systemd_shutdown_LDADD = \
 	libsystemd-basic.la \
@@ -931,6 +945,7 @@ systemd_modules_load_SOURCES = \
 	src/modules-load.c
 
 systemd_modules_load_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(KMOD_CFLAGS)
 
 systemd_modules_load_LDADD = \
@@ -1202,9 +1217,6 @@ include_HEADERS += \
 lib_LTLIBRARIES += \
 	libudev.la
 
-noinst_LTLIBRARIES += \
-	libudev-private.la
-
 libudev_la_SOURCES =\
 	src/udev/libudev-private.h \
 	src/udev/libudev.c \
@@ -1215,24 +1227,14 @@ libudev_la_SOURCES =\
 	src/udev/libudev-monitor.c \
 	src/udev/libudev-queue.c
 
+libudev_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-fvisibility=hidden
+
 libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
-libudev_private_la_SOURCES =\
-	$(libudev_la_SOURCES) \
-	src/udev/libudev-util-private.c \
-	src/udev/libudev-device-private.c \
-	src/udev/libudev-queue-private.c
-
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
-	src/udev/libudev-selinux-private.c
-endif
-
-libudev_private_la_LIBADD = \
-	$(SELINUX_LIBS)
-
 pkgconfiglib_DATA += \
 	src/udev/libudev.pc
 
@@ -1258,6 +1260,28 @@ libudev-uninstall-move-hook:
 INSTALL_EXEC_HOOKS += libudev-install-move-hook
 UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libudev-private.la
+
+libudev_private_la_SOURCES =\
+	$(libudev_la_SOURCES) \
+	src/udev/libudev-util-private.c \
+	src/udev/libudev-device-private.c \
+	src/udev/libudev-queue-private.c
+
+libudev_private_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-fvisibility=default
+
+if HAVE_SELINUX
+libudev_private_la_SOURCES +=\
+	src/udev/libudev-selinux-private.c
+
+libudev_private_la_LIBADD = \
+	$(SELINUX_LIBS)
+endif
+
 # ------------------------------------------------------------------------------
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1322,7 +1346,10 @@ bin_PROGRAMS += \
 udevlibexec_PROGRAMS = \
 	udevd
 
-udev_common_sources = \
+noinst_LTLIBRARIES += \
+	libudev-core.la
+
+libudev_core_la_SOURCES = \
 	src/udev/udev.h \
 	src/udev/udev-event.c \
 	src/udev/udev-watch.c \
@@ -1336,50 +1363,42 @@ udev_common_sources = \
 	src/udev/udev-builtin-input_id.c \
 	src/udev/udev-builtin-kmod.c \
 	src/udev/udev-builtin-path_id.c \
-	src/udev/udev-builtin-usb_id.c \
-	src/systemd/sd-daemon.h \
-	src/sd-daemon.c
+	src/udev/udev-builtin-usb_id.c
 
-udev_common_CFLAGS = \
+libudev_core_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(KMOD_CFLAGS)
 
-udev_common_LDADD = \
+libudev_core_la_LIBADD = \
 	libudev-private.la \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
-udev_common_CPPFLAGS = \
+libudev_core_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
 	-DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
 
 if HAVE_ACL
-udev_common_sources += \
+libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
 	src/login/logind-acl.c
 
-udev_common_LDADD += \
+libudev_core_la_LIBADD += \
 	libsystemd-login.la \
 	libsystemd-acl.la
 endif
 
 udevd_SOURCES = \
-	$(udev_common_sources) \
 	src/udev/udevd.c
 
-udevd_CFLAGS = \
-	$(udev_common_CFLAGS)
-
 udevd_LDADD = \
-	$(udev_common_LDADD) \
-	libsystemd-basic.la
-
-udevd_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
+	libudev-core.la
 
 udevadm_SOURCES = \
-	$(udev_common_sources) \
 	src/udev/udevadm.c \
 	src/udev/udevadm-info.c \
 	src/udev/udevadm-control.c \
@@ -1389,15 +1408,8 @@ udevadm_SOURCES = \
 	src/udev/udevadm-test.c \
 	src/udev/udevadm-test-builtin.c
 
-udevadm_CFLAGS = \
-	$(udev_common_CFLAGS)
-
 udevadm_LDADD = \
-	$(udev_common_LDADD) \
-	libsystemd-basic.la
-
-udevadm_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
+	libudev-core.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1415,19 +1427,13 @@ test_libudev_LDADD = \
 	libudev.la
 
 test_udev_SOURCES = \
-	$(udev_common_sources) \
 	src/udev/test-udev.c
 
-test_udev_CFLAGS = \
-	$(udev_common_CFLAGS)
-
 test_udev_LDADD = \
-	$(udev_common_LDADD) \
+	libudev-core.la \
+	libudev-private.la \
 	libsystemd-basic.la
 
-test_udev_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
-
 test_udev_DEPENDENCIES = \
 	src/udev/test/sys
 
@@ -1460,7 +1466,7 @@ cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-	libudev-private.la \
+	libudev.la \
 	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
@@ -1501,7 +1507,7 @@ v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-	libudev-private.la
+	libudev.la
 
 udevlibexec_PROGRAMS += \
 	v4l_id
@@ -1514,7 +1520,7 @@ accelerometer_SOURCES = \
 	src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-	libudev-private.la -lm \
+	libudev.la -lm \
 	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
@@ -1584,6 +1590,7 @@ libgudev_1_0_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"GUdev\"
 
 libgudev_1_0_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	-fvisibility=default \
 	$(GLIB_CFLAGS)
 
@@ -1912,6 +1919,7 @@ systemd_journald_SOURCES += \
 	src/journal/compress.c
 
 systemd_journald_CFLAGS += \
+	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 systemd_journald_LDADD += \
@@ -1999,6 +2007,7 @@ libsystemd_journal_la_SOURCES += \
 	src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
+	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \