X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8012620fd9e1fe37605f2dba0a64a09764faff94;hp=26b2fb261d5a1949808310b9659ee62e02ca863d;hb=92947a0878c5d129adb37ddbfdef35274ef5c6ae;hpb=1e65cb26be8a0d11a12c155af8f5740ec9b03415 diff --git a/Makefile.am b/Makefile.am index 26b2fb261..8012620fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,18 +55,15 @@ zshcompletiondir=@zshcompletiondir@ varlogdir=$(localstatedir)/log elogindstatedir=$(localstatedir)/lib/elogind +udevrulesdir=@udevrulesdir@ +udevbindir=@udevbindir@ + # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/elogind pkgincludedir=$(includedir)/elogind -udevrulesdir=$(rootprefix)/lib/udev/rules.d factory_etcdir = $(prefix)/share/factory/etc factory_pamdir = $(prefix)/share/factory/etc/pam.d -# And these are the special ones for / -rootprefix=@rootprefix@ -rootbindir=$(rootprefix)/bin -rootlibexecdir=$(rootprefix)/lib/elogind - EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = @@ -130,8 +127,6 @@ AM_CPPFLAGS = \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ - -DROOTLIBDIR=\"$(rootlibdir)\" \ - -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ @@ -148,18 +143,6 @@ 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_DIRS = - SHUTDOWN_TARGET_WANTS = LOCAL_FS_TARGET_WANTS = MULTI_USER_TARGET_WANTS = @@ -203,14 +186,7 @@ define add-wants for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done ) endef -install-directories-hook: - $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS)) - install-aliases-hook: - set -- $(SYSTEM_UNIT_ALIASES) && \ - dir=$(systemunitdir) && $(install-aliases) - set -- $(USER_UNIT_ALIASES) && \ - dir=$(userunitdir) && $(install-relative-aliases) set -- $(GENERAL_ALIASES) && \ dir= && $(install-relative-aliases) @@ -237,7 +213,6 @@ install-touch-usr-hook: INSTALL_EXEC_HOOKS += \ install-target-wants-hook \ - install-directories-hook \ install-aliases-hook \ install-touch-usr-hook @@ -268,9 +243,8 @@ AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) AM_V_RM_0 = @echo " RM " $@; # ------------------------------------------------------------------------------ -rootbin_PROGRAMS = bin_PROGRAMS = -rootlibexec_PROGRAMS = +pkglibexec_PROGRAMS = dist_bashcompletion_DATA = dist_zshcompletion_DATA = @@ -420,6 +394,7 @@ libelogind_shared_la_SOURCES = \ src/shared/cgroup-util.h \ src/shared/cgroup-show.c \ src/shared/cgroup-show.h \ + src/shared/logs-show.h \ src/shared/unit-name.c \ src/shared/unit-name.h \ src/shared/watchdog.c \ @@ -635,7 +610,6 @@ libelogind_internal_la_SOURCES = \ src/systemd/sd-login.h \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ - src/systemd/sd-path.h \ src/systemd/sd-network.h \ src/systemd/sd-device.h \ src/libelogind/sd-bus/sd-bus.c \ @@ -695,7 +669,6 @@ libelogind_internal_la_SOURCES = \ src/libelogind/sd-id128/sd-id128.c \ src/libelogind/sd-daemon/sd-daemon.c \ src/libelogind/sd-login/sd-login.c \ - src/libelogind/sd-path/sd-path.c \ src/libelogind/sd-network/sd-network.c \ src/libelogind/sd-network/network-util.h \ src/libelogind/sd-network/network-util.c \ @@ -720,24 +693,45 @@ libelogind_internal_la_LIBADD = \ libelogind-shared.la libelogind_internal_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \ - -Wl,--version-script=$(top_builddir)/src/libelogind/libelogind.sym + $(AM_LDFLAGS) + +lib_LTLIBRARIES += \ + libelogind.la + +libelogind_la_SOURCES = -libelogind-install-hook: - libname=libelogind.so && $(move-to-rootlibdir) +libelogind_la_CFLAGS = \ + $(AM_CFLAGS) -libelogind-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libelogind.so* +libelogind_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \ + -Wl,--version-script=src/libelogind/libelogind.sym -INSTALL_EXEC_HOOKS += libelogind-install-hook -UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook +libelogind_la_LIBADD = \ + libelogind-internal.la pkgconfiglib_DATA += \ - src/libelogind/libsystemd.pc + src/libelogind/libelogind.pc pkginclude_HEADERS += \ - src/systemd/sd-login.h + src/systemd/sd-login.h \ + src/systemd/sd-messages.h \ + src/systemd/sd-journal.h \ + src/systemd/_sd-common.h + +EXTRA_DIST += \ + src/libelogind/libelogind.sym.m4 \ + src/libelogind/libelogind.pc.in \ + src/libelogind/sd-bus/DIFFERENCES \ + src/libelogind/sd-bus/GVARIANT-SERIALIZATION + +CLEANFILES += \ + src/libelogind/libelogind.sym + +BUILT_SOURCES += \ + src/libelogind/libelogind.sym + # ------------------------------------------------------------------------------ elogind_SOURCES = \ @@ -789,8 +783,7 @@ endif noinst_LTLIBRARIES += \ libelogind-core.la -rootlibexec_PROGRAMS += \ - elogind +pkglibexec_PROGRAMS += elogind loginctl_SOURCES = \ src/login/loginctl.c \ @@ -802,15 +795,14 @@ loginctl_LDADD = \ libelogind-internal.la \ libelogind-shared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ loginctl dist_bashcompletion_DATA += \ shell-completion/bash/loginctl dist_zshcompletion_DATA += \ - shell-completion/zsh/_loginctl \ - shell-completion/zsh/_systemd-inhibit + shell-completion/zsh/_loginctl systemd_inhibit_SOURCES = \ src/login/inhibit.c @@ -819,7 +811,7 @@ systemd_inhibit_LDADD = \ libelogind-internal.la \ libelogind-shared.la -rootbin_PROGRAMS += \ +bin_PROGRAMS += \ systemd-inhibit test_login_SOURCES = \ @@ -844,7 +836,8 @@ test_inhibit_LDADD = \ libelogind-shared.la test_login_tables_SOURCES = \ - src/login/test-login-tables.c + src/login/test-login-tables.c \ + src/shared/test-tables.h test_login_tables_LDADD = \ libelogind-core.la @@ -899,9 +892,6 @@ dist_pkgsysconf_DATA += \ polkitpolicy_files += \ src/login/org.freedesktop.login1.policy -INSTALL_DIRS += \ - $(elogindstatedir) - SYSTEM_UNIT_ALIASES += \ elogind.service dbus-org.freedesktop.login1.service @@ -925,12 +915,10 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ substitutions = \ - '|rootlibexecdir=$(rootlibexecdir)|' \ - '|rootbindir=$(rootbindir)|' \ '|bindir=$(bindir)|' \ + '|udevbindir=$(udevbindir)|' \ '|pkgsysconfdir=$(pkgsysconfdir)|' \ '|pkgdatadir=$(pkgdatadir)|' \ - '|udevrulesdir=$(udevrulesdir)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ @@ -941,7 +929,6 @@ substitutions = \ '|VERSION=$(VERSION)|' \ '|rootprefix=$(rootprefix)|' \ '|MKDIR_P=$(MKDIR_P)|' \ - '|VARLOGDIR=$(varlogdir)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ '|systemgidmax=$(SYSTEM_GID_MAX)|' @@ -1090,9 +1077,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ - --with-rootprefix=$$dc_install_base \ - --disable-split-usr \ - --enable-kdbus + --enable-kdbus \ + --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) if ENABLE_GTK_DOC DISTCHECK_CONFIGURE_FLAGS += \