sd-login: build test code again

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index db0db19c31e1a81e1a9031293744390e0bf180cc..b526183300f5b70d168659e2da44f1aa5cafd3f2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0

-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1

 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0


@@ -545,7 +545,8 @@ libsystemd_basic_la_CFLAGS = \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \

-       $(SELINUX_LIBS)
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS)

 
 libsystemd_core_la_SOURCES = \
        src/unit.c \
 
 libsystemd_core_la_SOURCES = \
        src/unit.c \


@@ -614,7 +615,8 @@ libsystemd_core_la_LIBADD = \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \

-       $(AUDIT_LIBS)
+       $(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
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't


@@ -652,7 +654,8 @@ EXTRA_DIST += \
         src/logind-session.h \
         src/logind-user.h \
         src/logind-acl.h \
         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 \
 
 MANPAGES = \
        man/systemd.1 \


@@ -1434,6 +1437,19 @@ libsystemd_login_la_LDFLAGS = \
 libsystemd_login_la_LIBADD = \
        libsystemd-basic.la
 
 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' \
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \


@@ -1490,6 +1506,7 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \

+       $(pkgconfiglib_DATA) \

        $(nodist_polkitpolicy_DATA) \
         src/73-seat-late.rules \
         src/99-systemd.rules
        $(nodist_polkitpolicy_DATA) \
         src/73-seat-late.rules \
         src/99-systemd.rules


@@ -1847,9 +1864,9 @@ if HAVE_SYSV_COMPAT
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 

-install-exec-hook: libsystemd-daemon-install-hook
+install-exec-hook: libsystemd-daemon-install-hook libsystemd-login-install-hook

 
 

-uninstall-hook: libsystemd-daemon-uninstall-hook
+uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook

 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \