X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e796543d6070bc20bb9b5c3c08832de13feab573;hp=b594b65387441338a35ee169e0f005b7c9230b02;hb=63c862b051ae35199eb0d91c375b3c2b296bc0aa;hpb=dda9be8a99b177dc762fc1e5d27e4fcb5e977a80 diff --git a/Makefile.am b/Makefile.am index b594b6538..e796543d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -820,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) @@ -932,7 +933,6 @@ systemadm_SOURCES = \ systemadm_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUSGLIB_CFLAGS) \ $(GTK_CFLAGS) \ -Wno-unused-variable \ -Wno-unused-function \ @@ -940,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 = \ @@ -954,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 \ @@ -963,7 +960,6 @@ 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 \ @@ -977,7 +973,6 @@ systemd_gnome_ask_password_agent_VALAFLAGS += \ -g systemd_gnome_ask_password_agent_LDADD = \ - $(DBUSGLIB_LIBS) \ $(LIBNOTIFY_LIBS) \ $(GTK_LIBS) @@ -1195,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 && \ @@ -1258,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 && \ @@ -1269,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 )