X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e796543d6070bc20bb9b5c3c08832de13feab573;hp=dd475acf70f8ffbda8d43c239e837d01fb10707e;hb=63c862b051ae35199eb0d91c375b3c2b296bc0aa;hpb=8e1bd70d4ce6d3881c1df6a6482643a2b3a69bb1 diff --git a/Makefile.am b/Makefile.am index dd475acf7..e796543d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,12 +76,19 @@ AM_CPPFLAGS += \ -DKBD_SETFONT=\"/usr/bin/setfont\" \ -DDEFAULT_FONT=\"LatArCyrHeb-16\" else +if TARGET_FRUGALWARE +AM_CPPFLAGS += \ + -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ + -DKBD_SETFONT=\"/usr/bin/setfont\" \ + -DDEFAULT_FONT=\"LatArCyrHeb-16\" +else AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ -DKBD_SETFONT=\"/bin/setfont\" \ -DDEFAULT_FONT=\"latarcyrheb-sun16\" endif endif +endif rootbin_PROGRAMS = \ systemd \ @@ -317,7 +324,8 @@ EXTRA_DIST = \ units/fsck@.service.in \ units/fsck-root.service.in \ units/quotacheck.service.in \ - systemd.pc.in + systemd.pc.in \ + introspect.awk if TARGET_FEDORA dist_systemunit_DATA += \ @@ -333,16 +341,6 @@ dist_systemunit_DATA += \ units/fedora/plymouth-halt.service endif -if TARGET_GENTOO -dist_systemunit_DATA += \ - units/gentoo/xdm.service -endif - -if TARGET_ARCH -dist_systemunit_DATA += \ - units/arch/rc-local.service -endif - dist_doc_DATA = \ README \ LICENSE \ @@ -360,7 +358,8 @@ dist_polkitpolicy_DATA = \ noinst_LTLIBRARIES = \ libsystemd-basic.la \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la libsystemd_basic_la_SOURCES = \ src/util.c \ @@ -446,6 +445,9 @@ libsystemd_core_la_LIBADD = \ $(PAM_LIBS) \ $(AUDIT_LIBS) +libsystemd_daemon_la_SOURCES = \ + src/sd-daemon.c + # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't # list the .h files as dependencies if we want make dist to work. @@ -453,6 +455,7 @@ libsystemd_core_la_LIBADD = \ EXTRA_DIST += \ ${libsystemd_basic_la_SOURCES:.c=.h} \ ${libsystemd_core_la_SOURCES:.c=.h} \ + ${libsystemd_daemon_la_SOURCES:.c=.h} \ src/macro.h \ src/ioprio.h \ src/missing.h \ @@ -461,7 +464,6 @@ EXTRA_DIST += \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ src/initreq.h \ - src/sd-daemon.h \ src/sd-readahead.h \ src/special.h \ src/dbus-common.h \ @@ -505,7 +507,12 @@ MANPAGES = \ man/shutdown.8 \ man/pam_systemd.8 \ man/systemd.conf.5 \ - man/tmpfiles.d.5 + man/tmpfiles.d.5 \ + man/hostname.5 \ + man/vconsole.conf.5 \ + man/locale.conf.5 \ + man/os-release.5 \ + man/modules-load.d.5 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -593,11 +600,11 @@ test_hostname_LDADD = \ libsystemd-basic.la test_daemon_SOURCES = \ - src/test-daemon.c \ - src/sd-daemon.c + src/test-daemon.c test_daemon_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + libsystemd-daemon.la test_cgroup_SOURCES = \ src/test-cgroup.c \ @@ -619,7 +626,8 @@ test_env_replace_LDADD = \ libsystemd-basic.la test_strv_SOURCES = \ - src/test-strv.c + src/test-strv.c \ + src/specifier.c test_strv_CFLAGS = \ $(AM_CFLAGS) @@ -629,16 +637,15 @@ test_strv_LDADD = \ systemd_logger_SOURCES = \ src/logger.c \ - src/sd-daemon.c \ src/tcpwrap.c systemd_logger_LDADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(LIBWRAP_LIBS) systemd_initctl_SOURCES = \ src/initctl.c \ - src/sd-daemon.c \ src/dbus-common.c systemd_initctl_CFLAGS = \ @@ -647,6 +654,7 @@ systemd_initctl_CFLAGS = \ systemd_initctl_LDADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(DBUS_LIBS) systemd_update_utmp_SOURCES = \ @@ -675,14 +683,14 @@ systemd_random_seed_LDADD = \ systemd_shutdownd_SOURCES = \ src/utmp-wtmp.c \ - src/sd-daemon.c \ src/shutdownd.c systemd_shutdownd_CFLAGS = \ $(AM_CFLAGS) systemd_shutdownd_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + libsystemd-daemon.la systemd_shutdown_SOURCES = \ src/mount-setup.c \ @@ -773,10 +781,12 @@ systemd_cryptsetup_SOURCES = \ systemd_cryptsetup_CFLAGS = \ $(LIBCRYPTSETUP_CFLAGS) \ + $(UDEV_CFLAGS) \ $(AM_CFLAGS) systemd_cryptsetup_LDADD = \ $(LIBCRYPTSETUP_LIBS) \ + $(UDEV_LIBS) \ libsystemd-basic.la systemd_cryptsetup_generator_SOURCES = \ @@ -810,7 +820,8 @@ systemd_vconsole_setup_LDADD = \ systemd_remount_api_vfs_SOURCES = \ src/remount-api-vfs.c \ - src/mount-setup.c + src/mount-setup.c \ + src/exit-status.c systemd_remount_api_vfs_CFLAGS = \ $(AM_CFLAGS) @@ -832,21 +843,20 @@ systemd_cgroups_agent_LDADD = \ systemd_kmsg_syslogd_SOURCES = \ src/kmsg-syslogd.c \ - src/sd-daemon.c \ src/fdset.c systemd_kmsg_syslogd_CFLAGS = \ $(AM_CFLAGS) systemd_kmsg_syslogd_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + libsystemd-daemon.la systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ src/dbus-common.c \ src/path-lookup.c \ - src/sd-daemon.c \ src/cgroup-show.c \ src/cgroup-util.c \ src/exit-status.c \ @@ -858,15 +868,16 @@ systemctl_CFLAGS = \ systemctl_LDADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(DBUS_LIBS) systemd_notify_SOURCES = \ src/notify.c \ - src/sd-daemon.c \ src/sd-readahead.c systemd_notify_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + libsystemd-daemon.la systemd_ask_password_SOURCES = \ src/ask-password.c \ @@ -883,7 +894,6 @@ systemd_reply_password_LDADD = \ systemd_readahead_collect_SOURCES = \ src/readahead-collect.c \ - src/sd-daemon.c \ src/readahead-common.c systemd_readahead_collect_CFLAGS = \ @@ -891,11 +901,11 @@ systemd_readahead_collect_CFLAGS = \ systemd_readahead_collect_LDADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(UDEV_LIBS) systemd_readahead_replay_SOURCES = \ src/readahead-replay.c \ - src/sd-daemon.c \ src/readahead-common.c systemd_readahead_replay_CFLAGS = \ @@ -903,6 +913,7 @@ systemd_readahead_replay_CFLAGS = \ systemd_readahead_replay_LDADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(UDEV_LIBS) systemd_cgls_SOURCES = \ @@ -922,7 +933,6 @@ systemadm_SOURCES = \ systemadm_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUSGLIB_CFLAGS) \ $(GTK_CFLAGS) \ -Wno-unused-variable \ -Wno-unused-function \ @@ -930,13 +940,11 @@ systemadm_CFLAGS = \ -Wno-format-nonliteral systemadm_VALAFLAGS = \ - --pkg=dbus-glib-1 \ --pkg=posix \ --pkg=gtk+-2.0 \ -g systemadm_LDADD = \ - $(DBUSGLIB_LIBS) \ $(GTK_LIBS) systemd_gnome_ask_password_agent_SOURCES = \ @@ -944,7 +952,6 @@ systemd_gnome_ask_password_agent_SOURCES = \ systemd_gnome_ask_password_agent_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUSGLIB_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(GTK_CFLAGS) \ -Wno-unused-variable \ @@ -953,16 +960,19 @@ systemd_gnome_ask_password_agent_CFLAGS = \ -Wno-format-nonliteral systemd_gnome_ask_password_agent_VALAFLAGS = \ - --pkg=dbus-glib-1 \ --pkg=posix \ --pkg=gtk+-2.0 \ --pkg=linux \ --pkg=gio-unix-2.0 \ - --pkg=libnotify \ + --pkg=libnotify +if LIBNOTIFY07 +systemd_gnome_ask_password_agent_VALAFLAGS += \ + -D LIBNOTIFY07 +endif +systemd_gnome_ask_password_agent_VALAFLAGS += \ -g systemd_gnome_ask_password_agent_LDADD = \ - $(DBUSGLIB_LIBS) \ $(LIBNOTIFY_LIBS) \ $(GTK_LIBS) @@ -976,8 +986,7 @@ systemd_tty_ask_password_agent_LDADD = \ pam_systemd_la_SOURCES = \ src/pam-module.c \ - src/cgroup-util.c \ - src/sd-daemon.c + src/cgroup-util.c pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) @@ -992,6 +1001,7 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-basic.la \ + libsystemd-daemon.la \ $(PAM_LIBS) SED_PROCESS = \ @@ -1111,8 +1121,12 @@ CLEANFILES += \ ${XML_IN_FILES:.xml.in=.html.in} endif +DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h + org.freedesktop.systemd1.%.xml: systemd - $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@ + $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ + $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ + $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp CLEANFILES += \ $(dbusinterface_DATA) @@ -1176,14 +1190,12 @@ install-data-hook: fsck-root.service \ remount-rootfs.service \ var-run.mount \ - var-lock.mount \ - cryptsetup.target && \ + var-lock.mount && \ $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \ $(LN_S) ../fsck-root.service fsck-root.service && \ $(LN_S) ../remount-rootfs.service remount-rootfs.service && \ $(LN_S) ../var-run.mount var-run.mount && \ - $(LN_S) ../var-lock.mount var-lock.mount && \ - $(LN_S) ../cryptsetup.target ) + $(LN_S) ../var-lock.mount var-lock.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ @@ -1239,7 +1251,8 @@ install-data-hook: systemd-random-seed-load.service \ systemd-tmpfiles-setup.service \ systemd-sysctl.service \ - systemd-ask-password-console.path && \ + systemd-ask-password-console.path \ + cryptsetup.target && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ @@ -1250,7 +1263,8 @@ install-data-hook: $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \ - $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path ) + $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \ + $(LN_S) ../cryptsetup.target cryptsetup.target ) ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \ rm -f systemd-tmpfiles-clean.timer && \ $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer ) @@ -1297,14 +1311,6 @@ if TARGET_FEDORA rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif -if TARGET_GENTOO - ( cd $(DESTDIR)$(systemunitdir) && \ - rm -f display-manager.service && \ - $(LN_S) xdm.service display-manager.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) -endif if TARGET_DEBIAN_OR_UBUNTU ( cd $(DESTDIR)$(systemunitdir) && \ rm -f runlevel5.target && \ @@ -1327,8 +1333,3 @@ upload: all distcheck git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" - -# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job -fedora: install - rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount - rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount