chiark / gitweb /
exec: introduce PrivateNetwork= process option to turn off network access to specific...
[elogind.git] / Makefile.am
index 96e8838669e8b8cb3310180e6a28430bc6c19286..c446527e1bcc9005132616f35e19ca73a34e62b8 100644 (file)
@@ -19,6 +19,14 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
+LIBSYSTEMD_LOGIN_CURRENT=0
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=0
+
+LIBSYSTEMD_DAEMON_CURRENT=0
+LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -27,6 +35,7 @@ dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
+pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 
@@ -35,6 +44,7 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
+pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -161,7 +171,6 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-hostnamed \
         systemd-localed \
         systemd-timedated \
         systemd-logind \
@@ -172,6 +181,11 @@ rootlibexec_PROGRAMS += \
        systemd-binfmt
 endif
 
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -183,6 +197,14 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
+lib_LTLIBRARIES = \
+       libsystemd-daemon.la \
+       libsystemd-login.la
+
+pkginclude_HEADERS = \
+       src/sd-daemon.h \
+       src/sd-login.h
+
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -192,7 +214,9 @@ noinst_PROGRAMS = \
        test-daemon \
        test-cgroup \
        test-env-replace \
-       test-strv
+       test-strv \
+        test-login \
+        test-install
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -206,25 +230,33 @@ dist_pkgsysconf_DATA = \
 
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.hostname1.conf \
         src/org.freedesktop.locale1.conf \
         src/org.freedesktop.timedate1.conf \
         src/org.freedesktop.login1.conf
 
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.hostname1.conf
+endif
+
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service \
         src/org.freedesktop.locale1.service \
         src/org.freedesktop.timedate1.service \
         src/org.freedesktop.login1.service
 
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.hostname1.service
+endif
+
 dist_udevrules_DATA = \
         src/70-uaccess.rules \
-        src/71-seat.rules \
-       src/99-systemd.rules
+        src/71-seat.rules
 
 nodist_udevrules_DATA = \
-        src/73-seat-late.rules
+        src/73-seat-late.rules \
+        src/99-systemd.rules
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
@@ -240,10 +272,14 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Snapshot.xml \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml \
-        org.freedesktop.hostname1.xml \
         org.freedesktop.locale1.xml \
         org.freedesktop.timedate1.xml
 
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+endif
+
 dist_bashcompletion_DATA = \
        src/systemctl-bash-completion.sh
 
@@ -328,7 +364,6 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
-       units/systemd-hostnamed.service \
        units/systemd-localed.service \
        units/systemd-timedated.service \
        units/systemd-logind.service \
@@ -364,6 +399,11 @@ nodist_systemunit_DATA += \
        units/systemd-binfmt.service
 endif
 
+if ENABLE_HOSTNAMED
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+endif
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -379,7 +419,6 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-hostnamed.service.in \
        units/systemd-localed.service.in \
        units/systemd-timedated.service.in \
        units/systemd-logind.service.in \
@@ -408,17 +447,26 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
-        units/user@.service.in \
+       units/user@.service.in \
        systemd.pc.in \
+       libsystemd-daemon.pc.in \
+       libsystemd-login.pc.in \
+       src/libsystemd-daemon.sym \
+       src/libsystemd-login.sym \
        introspect.awk \
-       src/org.freedesktop.systemd1.policy.in \
-        src/73-seat-late.rules.in
+       src/73-seat-late.rules.in \
+        src/99-systemd.rules.in
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -475,22 +523,38 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-nodist_polkitpolicy_DATA = \
-       src/org.freedesktop.systemd1.policy
+pkgconfiglib_DATA = \
+        libsystemd-daemon.pc \
+        libsystemd-login.pc
 
-dist_polkitpolicy_in_files = \
-        src/org.freedesktop.hostname1.policy.in \
+# Passed through intltool only
+polkitpolicy_in_files = \
         src/org.freedesktop.locale1.policy.in \
         src/org.freedesktop.timedate1.policy.in \
         src/org.freedesktop.login1.policy.in
 
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+       src/org.freedesktop.hostname1.policy.in
+endif
+
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+       src/org.freedesktop.systemd1.policy.in.in
+
+nodist_polkitpolicy_DATA = \
+        $(polkitpolicy_in_files:.policy.in=.policy) \
+        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+        $(polkitpolicy_in_files) \
+        $(polkitpolicy_in_in_files)
+
 @INTLTOOL_POLICY_RULE@
-polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
-       libsystemd-core.la \
-       libsystemd-daemon.la
+       libsystemd-core.la
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
@@ -509,7 +573,8 @@ libsystemd_basic_la_CFLAGS = \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS)
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS)
 
 libsystemd_core_la_SOURCES = \
        src/unit.c \
@@ -561,7 +626,15 @@ libsystemd_core_la_SOURCES = \
        src/cgroup-util.c \
        src/condition.c \
         src/dbus-common.c \
-        src/sd-daemon.c
+        src/sd-daemon.c \
+        src/install.c
+
+nodist_libsystemd_core_la_SOURCES = \
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c
+
+EXTRA_DIST += \
+        src/load-fragment-gperf.gperf.m4
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -577,10 +650,8 @@ libsystemd_core_la_LIBADD = \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
-       $(AUDIT_LIBS)
-
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
+       $(AUDIT_LIBS) \
+       $(CAP_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
@@ -618,7 +689,8 @@ EXTRA_DIST += \
         src/logind-session.h \
         src/logind-user.h \
         src/logind-acl.h \
-        src/dbus-loop.h
+        src/dbus-loop.h \
+        src/spawn-agent.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -664,7 +736,8 @@ MANPAGES = \
         man/machine-info.5 \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
-        man/systemd-ask-password.1
+        man/systemd-ask-password.1 \
+        man/systemd-loginctl.1
 
 if ENABLE_BINFMT
 MANPAGES += \
@@ -792,6 +865,29 @@ test_strv_CFLAGS = \
 test_strv_LDADD = \
        libsystemd-basic.la
 
+test_login_SOURCES = \
+       src/test-login.c
+
+test_login_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_login_LDADD = \
+       libsystemd-basic.la \
+        libsystemd-login.la
+
+test_install_SOURCES = \
+       src/test-install.c \
+        src/install.c \
+        src/path-lookup.c \
+        src/unit-name.c
+
+test_install_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(DBUS_CFLAGS)
+
+test_install_LDADD = \
+       libsystemd-basic.la
+
 systemd_logger_SOURCES = \
        src/logger.c \
        src/tcpwrap.c
@@ -906,6 +1002,12 @@ systemd_logind_SOURCES = \
         src/cgroup-util.c \
         src/polkit.c
 
+nodist_systemd_logind_SOURCES = \
+        src/logind-gperf.c
+
+EXTRA_DIST += \
+        src/logind-gperf.gperf
+
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
@@ -937,6 +1039,8 @@ systemd_uaccess_CFLAGS = \
 
 systemd_uaccess_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
+       libsystemd-login.la \
         $(UDEV_LIBS) \
         $(ACL_LIBS)
 
@@ -1147,7 +1251,9 @@ systemctl_SOURCES = \
        src/cgroup-util.c \
        src/exit-status.c \
        src/unit-name.c \
-        src/pager.c
+        src/pager.c \
+        src/install.c \
+        src/spawn-agent.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1235,7 +1341,8 @@ systemd_cgls_LDADD = \
 
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+        src/loopback-setup.c
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS)
@@ -1330,6 +1437,61 @@ pam_systemd_la_LIBADD = \
        $(PAM_LIBS) \
         $(DBUS_LIBS)
 
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden \
+        -DSD_EXPORT_SYMBOLS
+
+libsystemd_daemon_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-daemon-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-daemon-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+
+libsystemd_login_la_SOURCES = \
+        src/sd-login.c \
+        src/cgroup-util.c
+
+libsystemd_login_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_login_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
+       libsystemd-basic.la
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-login-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-login-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -1346,6 +1508,9 @@ SED_PROCESS = \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
                -e 's,@prefix\@,$(prefix),g' \
+               -e 's,@exec_prefix\@,$(exec_prefix),g' \
+               -e 's,@libdir\@,$(libdir),g' \
+               -e 's,@includedir\@,$(includedir),g' \
                < $< > $@ || rm $@
 
 units/%: units/%.in Makefile
@@ -1357,19 +1522,31 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
 
 src/%.rules: src/%.rules.in Makefile
        $(SED_PROCESS)
 
+src/%.c: src/%.gperf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(GPERF) < $< > $@
+
+src/%: src/%.m4
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+
+src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+        $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
 
 M4_PROCESS_USER = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
 
 units/%: units/%.m4 Makefile
        $(M4_PROCESS_SYSTEM)
@@ -1383,8 +1560,14 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
-       $(polkitpolicy_DATA) \
-       src/org.freedesktop.systemd1.policy
+       $(pkgconfiglib_DATA) \
+       $(nodist_polkitpolicy_DATA) \
+        src/73-seat-late.rules \
+        src/99-systemd.rules \
+        src/load-fragment-gperf.gperf \
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c \
+        src/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1460,22 +1643,22 @@ endif
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
@@ -1578,10 +1761,9 @@ endif
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
-                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service && \
                 $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
                 $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
                 $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
@@ -1629,6 +1811,11 @@ if ENABLE_BINFMT
                        proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+endif
+if ENABLE_HOSTNAMED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
 endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
@@ -1739,6 +1926,10 @@ if HAVE_SYSV_COMPAT
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
+install-exec-hook: libsystemd-daemon-install-hook libsystemd-login-install-hook
+
+uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \