X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d53f242d4136da88e54d157c5bbcc12509f45349;hp=bf9082428a387bf2799a326ff323e6e409ff3f1a;hb=3b148b365934f5baf2c9162e2454ca416b666531;hpb=7146d24aeaac6bf5a9f1fbe0c786a846410145ff diff --git a/Makefile.am b/Makefile.am index bf9082428..d53f242d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,9 +38,9 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBELOGIND_CURRENT=15 -LIBELOGIND_REVISION=0 -LIBELOGIND_AGE=15 +LIBELOGIND_CURRENT=17 +LIBELOGIND_REVISION=2 +LIBELOGIND_AGE=17 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -76,8 +76,6 @@ EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = -INSTALL_DATA_HOOKS = -UNINSTALL_DATA_HOOKS = DISTCLEAN_LOCAL_HOOKS = CLEAN_LOCAL_HOOKS = pkginclude_HEADERS = @@ -95,6 +93,8 @@ dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = check_PROGRAMS = check_DATA = +dist_rootlibexec_DATA = +rootlib_LTLIBRARIES = tests= manual_tests = if ENABLE_TESTS @@ -122,7 +122,6 @@ CLEANFILES = $(BUILT_SOURCES) \ $(m4_files:.m4=) .PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \ - $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \ $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS) AM_CPPFLAGS = \ @@ -152,22 +151,15 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libelogind/sd-bus \ -I $(top_srcdir)/src/libelogind/sd-event \ -I $(top_srcdir)/src/libelogind/sd-login \ + -I $(top_srcdir)/src/libelogind/sd-id128 \ + -I $(top_srcdir)/src/update-utmp \ + -I $(top_srcdir)/src/sleep \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ -define move-to-rootlibdir - if test "$(libdir)" != "$(rootlibdir)"; then \ - $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ - so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ - rm -f $(DESTDIR)$(libdir)/$$libname && \ - $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ - mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ - fi -endef - install-touch-usr-hook: touch -c $(DESTDIR)/$(prefix) @@ -298,8 +290,6 @@ noinst_LTLIBRARIES += \ libbasic_la_SOURCES = \ src/basic/missing.h \ - src/basic/musl_missing.h \ - src/basic/musl_missing.c \ src/basic/capability-util.c \ src/basic/capability-util.h \ src/basic/conf-files.c \ @@ -344,6 +334,8 @@ libbasic_la_SOURCES = \ src/basic/escape.h \ src/basic/path-util.c \ src/basic/path-util.h \ + src/basic/parse-printf-format.c \ + src/basic/parse-printf-format.h \ src/basic/time-util.c \ src/basic/time-util.h \ src/basic/locale-util.c \ @@ -413,9 +405,7 @@ libbasic_la_SOURCES = \ src/basic/copy.c \ src/basic/copy.h \ src/basic/alloc-util.h \ - src/basic/alloc-util.c \ - src/basic/parse-printf-format.c \ - src/basic/parse-printf-format.h + src/basic/alloc-util.c nodist_libbasic_la_SOURCES = \ src/basic/errno-from-name.h \ @@ -441,16 +431,20 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ + src/shared/bus-util.c \ + src/shared/bus-util.h \ + src/shared/clean-ipc.c \ + src/shared/clean-ipc.h \ src/shared/conf-parser.c \ src/shared/conf-parser.h \ + src/shared/musl_missing.h \ + src/shared/musl_missing.c \ src/shared/pager.c \ src/shared/pager.h \ + src/shared/sleep-config.c \ + src/shared/sleep-config.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h \ - src/shared/clean-ipc.c \ - src/shared/clean-ipc.h \ - src/shared/bus-util.c \ - src/shared/bus-util.h + src/shared/spawn-polkit-agent.h if HAVE_ACL libshared_la_SOURCES += \ @@ -464,9 +458,43 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libelogind-internal.la \ + libbasic.la \ $(UDEV_LIBS) \ $(ACL_LIBS) +noinst_LTLIBRARIES += \ + libelogind-shared.la + +libelogind_shared_la_SOURCES = \ + $(libbasic_la_SOURCES) \ + $(libshared_la_SOURCES) \ + $(libelogind_internal_la_SOURCES) + +libelogind_shared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(libbasic_la_CFLAGS) \ + $(libshared_la_CFLAGS) \ + $(libelogind_internal_la_CFLAGS) \ + $(libelogind_journal_internal_la_CFLAGS) \ + $(libudev_internal_la_CFLAGS) \ + $(ACL_CFLAGS) \ + $(LIBIDN_CFLAGS) \ + $(SECCOMP_CFLAGS) \ + -fvisibility=default + +# We can't use libshared_la_LIBADD here because it would +# pull in libelogind*-internal.la +libelogind_shared_la_LIBADD = \ + $(libbasic_la_LIBADD) \ + $(libelogind_internal_la_LIBADD) \ + $(UDEV_LIBS) \ + $(ACL_LIBS) \ + $(LIBIDN_LIBS) \ + $(SECCOMP_LIBS) + +libelogind_shared_la_LDFLAGS = \ + $(AM_LDFLAGS) + # ----------------------------------------------------------------------------- gperf_txt_sources = \ src/basic/errno-list.txt @@ -522,7 +550,7 @@ elogind_cgroups_agent_SOURCES = \ src/cgroups-agent/cgroups-agent.c elogind_cgroups_agent_LDADD = \ - libshared.la + libelogind-shared.la # ------------------------------------------------------------------------------ libelogind_internal_la_SOURCES = \ @@ -575,13 +603,11 @@ libelogind_internal_la_SOURCES = \ src/libelogind/sd-bus/bus-protocol.h \ src/libelogind/sd-event/sd-event.c \ src/libelogind/sd-id128/sd-id128.c \ + src/libelogind/sd-id128/id128-util.h \ + src/libelogind/sd-id128/id128-util.c \ src/libelogind/sd-daemon/sd-daemon.c \ src/libelogind/sd-login/sd-login.c -libelogind_internal_la_LIBADD = \ - libbasic.la \ - -lresolv - noinst_LTLIBRARIES += \ libelogind-internal.la @@ -590,14 +616,7 @@ EXTRA_DIST += \ src/libelogind/sd-bus/DIFFERENCES \ src/libelogind/sd-bus/GVARIANT-SERIALIZATION -libelogind_la_SOURCES = \ - $(libelogind_internal_la_SOURCES) - -nodist_libelogind_la_SOURCES = \ - $(nodist_libelogind_internal_la_SOURCES) - -libelogind_la_CFLAGS = \ - $(libelogind_internal_la_CFLAGS) +libelogind_la_SOURCES = libelogind_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -605,16 +624,8 @@ libelogind_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libelogind/libelogind.sym libelogind_la_LIBADD = \ - $(libelogind_internal_la_LIBADD) - -libelogind-install-hook: - libname=libelogind.so && $(move-to-rootlibdir) - -libelogind-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libelogind.so* - -INSTALL_EXEC_HOOKS += libelogind-install-hook -UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook + libelogind-internal.la \ + libbasic.la pkgconfiglib_DATA += \ src/libelogind/libelogind.pc @@ -629,6 +640,7 @@ header-install-hook: $(MKDIR_P) $(DESTDIR)/$(pkgincludedir) cd $(DESTDIR)/$(includedir)/elogind && \ for hdr in $(notdir $(pkginclude_HEADERS)) ; do \ + rm -f $$hdr ; \ $(LN_S) systemd/$$hdr $$hdr ; \ done @@ -638,7 +650,7 @@ header-uninstall-hook: INSTALL_EXEC_HOOKS += header-install-hook UNINSTALL_EXEC_HOOKS += header-uninstall-hook -lib_LTLIBRARIES += \ +rootlib_LTLIBRARIES += \ libelogind.la # ------------------------------------------------------------------------------ @@ -653,6 +665,16 @@ elogind_LDADD = \ libelogind-core.la libelogind_core_la_SOURCES = \ + src/core/cgroup.h \ + src/core/cgroup.c \ + src/core/mount-setup.h \ + src/core/mount-setup.c \ + src/login/elogind.c \ + src/login/elogind.h \ + src/login/elogind-action.c \ + src/login/elogind-action.h \ + src/login/elogind-dbus.c \ + src/login/elogind-dbus.h \ src/login/logind-core.c \ src/login/logind-device.c \ src/login/logind-device.h \ @@ -666,8 +688,6 @@ libelogind_core_la_SOURCES = \ src/login/logind-session.h \ src/login/logind-session-device.c \ src/login/logind-session-device.h \ - src/login/logind-sleep.c \ - src/login/logind-sleep.h \ src/login/logind-user.c \ src/login/logind-user.h \ src/login/logind-inhibit.c \ @@ -676,14 +696,19 @@ libelogind_core_la_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ + src/login/logind-utmp.c \ src/login/logind-acl.h \ - src/core/cgroup.h \ - src/core/cgroup.c \ - src/core/mount-setup.h \ - src/core/mount-setup.c + src/sleep/sleep.c \ + src/sleep/sleep.h + +if HAVE_UTMP +libelogind_core_la_SOURCES += \ + src/shared/utmp-wtmp.c \ + src/update-utmp/update-utmp.c +endif libelogind_core_la_LIBADD = \ - libshared.la + libelogind-shared.la if HAVE_ACL libelogind_core_la_SOURCES += \ @@ -697,12 +722,14 @@ pkglibexec_PROGRAMS += \ elogind loginctl_SOURCES = \ + src/login/eloginctl.c \ + src/login/eloginctl.h \ src/login/loginctl.c \ src/login/sysfs-show.h \ src/login/sysfs-show.c loginctl_LDADD = \ - libshared.la + libelogind-shared.la rootbin_PROGRAMS += \ loginctl @@ -718,7 +745,7 @@ elogind_inhibit_SOURCES = \ src/login/inhibit.c elogind_inhibit_LDADD = \ - libshared.la + libelogind-shared.la rootbin_PROGRAMS += \ elogind-inhibit @@ -727,19 +754,19 @@ test_login_SOURCES = \ src/libelogind/sd-login/test-login.c test_login_LDADD = \ - libshared.la + libelogind-shared.la test_login_shared_SOURCES = \ src/login/test-login-shared.c test_login_shared_LDADD = \ - libshared.la + libelogind-shared.la test_inhibit_SOURCES = \ src/login/test-inhibit.c test_inhibit_LDADD = \ - libshared.la + libelogind-shared.la test_login_tables_SOURCES = \ src/login/test-login-tables.c @@ -779,8 +806,10 @@ pam_elogind_la_LIBADD = \ pamlib_LTLIBRARIES = \ pam_elogind.la +if ENABLE_PAM_CONFIG dist_pamconf_DATA = \ src/login/elogind-user +endif EXTRA_DIST += \ src/login/elogind-user.m4 @@ -959,9 +988,7 @@ EXTRA_DIST += \ install-exec-hook: $(INSTALL_EXEC_HOOKS) -uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS) - -install-data-hook: $(INSTALL_DATA_HOOKS) +uninstall-hook: $(UNINSTALL_EXEC_HOOKS) distclean-local: $(DISTCLEAN_LOCAL_HOOKS) @@ -1056,7 +1083,7 @@ install-tree: all .PHONY: valgrind-tests valgrind-tests: $(TESTS) $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \ - if file $$f | grep -q shell; then \ + if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \ echo -e "$${x}Skipping non-binary $$f"; else \ echo -e "$${x}Running $$f"; \ libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ @@ -1143,7 +1170,7 @@ print-%: @echo $($*) git-contrib: - @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u + @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | sed 's/ / /g' | awk '{ print $$0 "," }' | sort -u EXTRA_DIST += \ tools/gdb-sd_dump_hashmaps.py