audit: remove double header inclusion

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b6041b5d1cff7fc96dbbcc4aefc8ea901a20f48d..038b72e1e14ffea91888fd7531b9af35bd71a0bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,8 @@ endif
 rootlibexec_PROGRAMS = \
        systemd-logger \
        systemd-cgroups-agent \
-       systemd-initctl
+       systemd-initctl \
+       systemd-update-utmp
 
 noinst_PROGRAMS = \
        test-engine \
@@ -158,6 +159,8 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
+       units/systemd-update-utmp-runlevel.service \
+       units/systemd-update-utmp-shutdown.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -175,6 +178,8 @@ EXTRA_DIST = \
        units/remote-fs.target.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
+       units/systemd-update-utmp-runlevel.service.in \
+       units/systemd-update-utmp-shutdown.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -243,6 +248,13 @@ libsystemd_basic_la_SOURCES = \
         src/log.c \
         src/ratelimit.c
 
+libsystemd_basic_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+       $(SELINUX_LIBS)
+
 libsystemd_core_la_SOURCES = \
        src/unit.c \
         src/job.c \
@@ -282,7 +294,6 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/modprobe-setup.c \
-       src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -293,7 +304,10 @@ libsystemd_core_la_SOURCES = \
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(LIBWRAP_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(AUDIT_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -301,7 +315,7 @@ libsystemd_core_la_LIBADD = \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
-       $(SELINUX_LIBS)
+       $(AUDIT_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
@@ -321,7 +335,8 @@ EXTRA_DIST += \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
-       src/cgroup-show.h
+       src/cgroup-show.h \
+       src/utmp-wtmp.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -480,6 +495,21 @@ systemd_initctl_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_update_utmp_SOURCES = \
+       src/update-utmp.c \
+       src/dbus-common.c \
+       src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+       $(AUDIT_LIBS)
+
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent.c \
        src/dbus-common.c
@@ -697,6 +727,12 @@ install-data-hook:
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
                $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@ -712,6 +748,24 @@ install-data-hook:
                rm -f systemd-initctl.socket systemd-logger.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+               rm -f systemd-update-utmp-shutdown.service && \
+               $(LN_S) ../systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -764,8 +818,8 @@ install-data-hook:
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-               $(DESTDIR)$(systemunitdir)/rescue.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants
+               $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/rescue.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )