chiark / gitweb /
import: rename download code from "import" to "pull"
[elogind.git] / Makefile.am
index d9d71df9efb87fd11cf4071a0343bef3e92f8e1c..19071d9ffc4c19555831996cf59c52d25a085d69 100644 (file)
@@ -145,6 +145,7 @@ dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 dist_systemunit_DATA_busnames =
+dist_sysusers_DATA =
 check_PROGRAMS =
 check_DATA =
 tests=
@@ -199,6 +200,7 @@ AM_CPPFLAGS = \
        -DKEXEC=\"$(KEXEC)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DROOTLIBDIR=\"$(rootlibdir)\" \
+       -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
        -I $(top_srcdir)/src \
        -I $(top_builddir)/src/shared \
@@ -242,14 +244,11 @@ endef
 
 INSTALL_DIRS =
 
-RUNLEVEL1_TARGET_WANTS =
-RUNLEVEL2_TARGET_WANTS =
-RUNLEVEL3_TARGET_WANTS =
-RUNLEVEL4_TARGET_WANTS =
-RUNLEVEL5_TARGET_WANTS =
 SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
+GRAPHICAL_TARGET_WANTS =
+RESCUE_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
@@ -263,14 +262,11 @@ USER_UNIT_ALIASES =
 GENERAL_ALIASES =
 
 install-target-wants-hook:
-       what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
        what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
        what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
        what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
+       what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
+       what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
@@ -504,6 +500,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-fs-fuse-connections.mount \
        units/tmp.mount \
+       units/var-lib-machines.mount \
        units/printer.target \
        units/sound.target \
        units/bluetooth.target \
@@ -981,6 +978,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/btrfs-ctree.h \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
+       src/shared/machine-pool.c \
+       src/shared/machine-pool.h \
        src/shared/copy.c \
        src/shared/copy.h
 
@@ -2216,10 +2215,10 @@ nodist_systemunit_DATA += \
        units/systemd-tmpfiles-clean.service
 
 nodist_tmpfiles_DATA = \
+       tmpfiles.d/systemd.conf \
        tmpfiles.d/etc.conf
 
 dist_tmpfiles_DATA = \
-       tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
@@ -2246,12 +2245,14 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
+       tmpfiles.d/systemd.conf.m4 \
        tmpfiles.d/etc.conf.m4 \
        units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in
 
 CLEANFILES += \
+       tmpfiles.d/systemd.conf \
        tmpfiles.d/etc.conf
 
 # ------------------------------------------------------------------------------
@@ -2274,17 +2275,17 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
-dist_sysusers_DATA = \
-       sysusers.d/systemd.conf
-
 nodist_sysusers_DATA = \
+       sysusers.d/systemd.conf \
        sysusers.d/basic.conf
 
 EXTRA_DIST += \
        units/systemd-sysusers.service.in \
+       sysusers.d/systemd.conf.m4 \
        sysusers.d/basic.conf.in
 
 CLEANFILES += \
+       sysusers.d/systemd.conf \
        sysusers.d/basic.conf
 
 INSTALL_DIRS += \
@@ -2363,6 +2364,7 @@ systemd_fsck_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_fsckd_SOURCES = \
        src/fsckd/fsckd.c \
+       src/fsckd/fsckd.h \
        $(NULL)
 
 systemd_fsckd_LDADD = \
@@ -2494,6 +2496,7 @@ systemd_efi_boot_generator_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+if HAVE_BLKID
 bootctl_SOURCES = \
        src/boot/bootctl.c
 
@@ -2519,6 +2522,7 @@ dist_bashcompletion_DATA += \
 
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
+endif
 
 # ------------------------------------------------------------------------------
 if HAVE_GNUEFI
@@ -2533,6 +2537,7 @@ efi_cflags = \
        $(EFI_CFLAGS) \
        -Wall \
        -Wextra \
+       -std=gnu90 \
        -nostdinc \
        -ggdb -O0 \
        -fpic \
@@ -2542,6 +2547,7 @@ efi_cflags = \
        -fno-strict-aliasing \
        -fno-stack-protector \
        -Wsign-compare \
+       -Wno-missing-field-initializers \
        -mno-sse \
        -mno-mmx
 
@@ -2549,8 +2555,7 @@ if ARCH_X86_64
 efi_cflags += \
        -mno-red-zone \
        -DEFI_FUNCTION_WRAPPER \
-       -DGNU_EFI_USE_MS_ABI \
-       -std=gnu90
+       -DGNU_EFI_USE_MS_ABI
 endif
 
 efi_ldflags = \
@@ -2603,11 +2608,15 @@ $(systemd_boot): $(systemd_boot_solib)
 stub_headers = \
        src/boot/efi/util.h \
        src/boot/efi/pefile.h \
+       src/boot/efi/graphics.h \
+       src/boot/efi/splash.h \
        src/boot/efi/linux.h
 
 stub_sources = \
        src/boot/efi/util.c \
        src/boot/efi/pefile.c \
+       src/boot/efi/graphics.c \
+       src/boot/efi/splash.c \
        src/boot/efi/linux.c \
        src/boot/efi/stub.c
 
@@ -3931,9 +3940,14 @@ TESTS += \
 if HAVE_PYTHON
 TESTS += \
        test/rule-syntax-check.py \
+       $(NULL)
+
+if HAVE_SYSV_COMPAT
+TESTS += \
        test/sysv-generator-test.py \
        $(NULL)
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -4812,7 +4826,7 @@ dist_bashcompletion_DATA += \
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_coredumpctl
 
-sysctl_DATA = \
+nodist_sysctl_DATA = \
        sysctl.d/50-coredump.conf
 
 CLEANFILES += \
@@ -5432,16 +5446,16 @@ systemd_importd_LDADD = \
 
 systemd_pull_SOURCES = \
        src/import/pull.c \
-       src/import/import-raw.c \
-       src/import/import-raw.h \
-       src/import/import-tar.c \
-       src/import/import-tar.h \
-       src/import/import-dkr.c \
-       src/import/import-dkr.h \
-       src/import/import-job.c \
-       src/import/import-job.h \
-       src/import/import-common.c \
-       src/import/import-common.h \
+       src/import/pull-raw.c \
+       src/import/pull-raw.h \
+       src/import/pull-tar.c \
+       src/import/pull-tar.h \
+       src/import/pull-dkr.c \
+       src/import/pull-dkr.h \
+       src/import/pull-job.c \
+       src/import/pull-job.h \
+       src/import/pull-common.c \
+       src/import/pull-common.h \
        src/import/curl-util.c \
        src/import/curl-util.h \
        src/import/aufs-util.c \
@@ -5905,15 +5919,8 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-logind-core.la
 
-systemd_user_sessions_SOURCES = \
-       src/login/user-sessions.c
-
-systemd_user_sessions_LDADD = \
-       libsystemd-shared.la
-
 rootlibexec_PROGRAMS += \
-       systemd-logind \
-       systemd-user-sessions
+       systemd-logind
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
@@ -6010,11 +6017,11 @@ pamlib_LTLIBRARIES = \
 
 dist_pamconf_DATA = \
        src/login/systemd-user
+
 endif
 
 nodist_systemunit_DATA += \
-       units/systemd-logind.service \
-       units/systemd-user-sessions.service
+       units/systemd-logind.service
 
 dist_systemunit_DATA += \
        units/user.slice
@@ -6038,8 +6045,7 @@ INSTALL_DIRS += \
        $(systemdstatedir)
 
 MULTI_USER_TARGET_WANTS += \
-       systemd-logind.service \
-       systemd-user-sessions.service
+       systemd-logind.service
 
 SYSTEM_UNIT_ALIASES += \
        systemd-logind.service dbus-org.freedesktop.login1.service
@@ -6068,10 +6074,33 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
-       units/systemd-logind.service.in \
+       units/systemd-logind.service.in
+
+# ------------------------------------------------------------------------------
+if HAVE_PAM
+
+systemd_user_sessions_SOURCES = \
+       src/user-sessions/user-sessions.c
+
+systemd_user_sessions_LDADD = \
+       libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+       systemd-user-sessions
+
+nodist_systemunit_DATA += \
+       units/systemd-user-sessions.service
+
+EXTRA_DIST += \
        units/systemd-user-sessions.service.in
 
+MULTI_USER_TARGET_WANTS += \
+       systemd-user-sessions.service
+
+endif
+
 # ------------------------------------------------------------------------------
+
 if HAVE_PYTHON_DEVEL
 pkgpyexec_LTLIBRARIES = \
        _journal.la \
@@ -6572,15 +6601,11 @@ SOCKETS_TARGET_WANTS += \
 
 if HAVE_UTMP
 if HAVE_SYSV_COMPAT
-RUNLEVEL1_TARGET_WANTS += \
-       systemd-update-utmp-runlevel.service
-RUNLEVEL2_TARGET_WANTS += \
-       systemd-update-utmp-runlevel.service
-RUNLEVEL3_TARGET_WANTS += \
+MULTI_USER_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
-RUNLEVEL4_TARGET_WANTS += \
+GRAPHICAL_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
-RUNLEVEL5_TARGET_WANTS += \
+RESCUE_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
 
@@ -6593,7 +6618,8 @@ SYSINIT_TARGET_WANTS += \
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       tmp.mount
+       tmp.mount \
+       var-lib-machines.mount
 
 MULTI_USER_TARGET_WANTS += \
        getty.target \