X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=db0db19c31e1a81e1a9031293744390e0bf180cc;hp=fc59b57c0f52796c7d8a976a08ef04e59eab533a;hb=02f130cbd943c5c177cb0e711db0447cac685d67;hpb=1eae4c45c9d04314c927c8ac6323133414020ba3 diff --git a/Makefile.am b/Makefile.am index fc59b57c0..db0db19c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ dbusinterfacedir=@dbusinterfacedir@ udevrulesdir=@udevrulesdir@ pamlibdir=@pamlibdir@ pkgconfigdatadir=$(datadir)/pkgconfig +pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=$(sysconfdir)/bash_completion.d @@ -194,10 +195,11 @@ endif lib_LTLIBRARIES = \ libsystemd-daemon.la \ - libsystemd-login.la + libsystemd-login.la pkginclude_HEADERS = \ - src/sd-login.h + src/sd-daemon.h \ + src/sd-login.h noinst_PROGRAMS = \ test-engine \ @@ -209,7 +211,8 @@ noinst_PROGRAMS = \ test-cgroup \ test-env-replace \ test-strv \ - test-login + test-login \ + test-install if HAVE_PAM pamlib_LTLIBRARIES = \ @@ -237,11 +240,11 @@ dist_dbussystemservice_DATA = \ dist_udevrules_DATA = \ src/70-uaccess.rules \ - src/71-seat.rules \ - src/99-systemd.rules + src/71-seat.rules nodist_udevrules_DATA = \ - src/73-seat-late.rules + src/73-seat-late.rules \ + src/99-systemd.rules dbusinterface_DATA = \ org.freedesktop.systemd1.Manager.xml \ @@ -425,12 +428,15 @@ EXTRA_DIST = \ units/fsck@.service.in \ units/fsck-root.service.in \ units/quotacheck.service.in \ - units/user@.service.in \ + units/user@.service.in \ systemd.pc.in \ - libsystemd-daemon.pc.in \ - libsystemd-login.pc.in \ + libsystemd-daemon.pc.in \ + libsystemd-login.pc.in \ + src/libsystemd-daemon.sym \ + src/libsystemd-login.sym \ introspect.awk \ - src/73-seat-late.rules.in + src/73-seat-late.rules.in \ + src/99-systemd.rules.in if ENABLE_BINFMT EXTRA_DIST += \ @@ -491,7 +497,9 @@ dist_doc_DATA = \ src/sd-readahead.c pkgconfigdata_DATA = \ - systemd.pc \ + systemd.pc + +pkgconfiglib_DATA = \ libsystemd-daemon.pc \ libsystemd-login.pc @@ -589,7 +597,8 @@ libsystemd_core_la_SOURCES = \ src/cgroup-util.c \ src/condition.c \ src/dbus-common.c \ - src/sd-daemon.c + src/sd-daemon.c \ + src/install.c libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -828,6 +837,19 @@ test_login_LDADD = \ libsystemd-basic.la \ libsystemd-login.la +test_install_SOURCES = \ + src/test-install.c \ + src/install.c \ + src/path-lookup.c \ + src/unit-name.c + +test_install_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_install_LDADD = \ + libsystemd-basic.la + systemd_logger_SOURCES = \ src/logger.c \ src/tcpwrap.c @@ -974,6 +996,7 @@ systemd_uaccess_CFLAGS = \ systemd_uaccess_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ + libsystemd-login.la \ $(UDEV_LIBS) \ $(ACL_LIBS) @@ -1184,7 +1207,9 @@ systemctl_SOURCES = \ src/cgroup-util.c \ src/exit-status.c \ src/unit-name.c \ - src/pager.c + src/pager.c \ + src/install.c \ + src/spawn-agent.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1380,6 +1405,19 @@ libsystemd_daemon_la_LDFLAGS = \ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libsystemd-daemon-install-hook: + if test "$(libdir)" != "$(rootlibdir)"; then \ + mkdir -p $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.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-daemon.so && \ + mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libsystemd-daemon-uninstall-hook: + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so* + libsystemd_login_la_SOURCES = \ src/sd-login.c \ src/cgroup-util.c @@ -1453,7 +1491,8 @@ CLEANFILES = \ ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) \ $(nodist_polkitpolicy_DATA) \ - src/73-seat-late.rules + src/73-seat-late.rules \ + src/99-systemd.rules if HAVE_VALAC CLEANFILES += \ @@ -1808,6 +1847,10 @@ if HAVE_SYSV_COMPAT $(LN_S) ../var-lock.mount var-lock.mount ) endif +install-exec-hook: libsystemd-daemon-install-hook + +uninstall-hook: libsystemd-daemon-uninstall-hook + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \