chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Makefile.am: Don't ship 70-power-switch.rules
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f5bfd26425e985ce02bc9521dbd98eda0cb0e523..525847b9aa9d29250dac304ccf2ef97e9c128a0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=18
-LIBELOGIND_REVISION=3
-LIBELOGIND_AGE=18
+LIBELOGIND_CURRENT=19
+LIBELOGIND_REVISION=4
+LIBELOGIND_AGE=19
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -65,14 +65,16 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
+
 rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+rootlibdir=@rootlibdir@
+rootlibexecdir=@rootlibexecdir@
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -204,11 +206,7 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
-rootlibexec_PROGRAMS = \
-       elogind \
-       elogind-cgroups-agent
-
-pkglibexec_PROGRAMS =
+rootlibexec_PROGRAMS =
 
 dist_doc_DATA = \
        README \
@@ -260,9 +258,11 @@ man/index.html: man/elogind.index.html
        $(AM_V_LN)$(LN_S) -f elogind.index.html $@
 
 if HAVE_PYTHON
+if ENABLE_MANPAGES
 noinst_DATA += \
        man/index.html
 endif
+endif
 
 CLEANFILES += \
        man/index.html
@@ -456,6 +456,8 @@ noinst_LTLIBRARIES += \
        libshared.la
 
 libshared_la_SOURCES = \
+       src/shared/udev-util.h \
+       src/shared/udev-util.c \
        src/shared/bus-util.c \
        src/shared/bus-util.h \
        src/shared/clean-ipc.c \
@@ -507,7 +509,6 @@ libelogind_shared_la_CFLAGS = \
        $(libelogind_journal_internal_la_CFLAGS) \
        $(libudev_internal_la_CFLAGS) \
        $(ACL_CFLAGS) \
-       $(LIBIDN_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -fvisibility=default
 
@@ -518,7 +519,6 @@ libelogind_shared_la_LIBADD = \
        $(libelogind_internal_la_LIBADD) \
        $(UDEV_LIBS) \
        $(ACL_LIBS) \
-       $(LIBIDN_LIBS) \
        $(SECCOMP_LIBS)
 
 libelogind_shared_la_LDFLAGS = \
@@ -598,6 +598,7 @@ tests += \
        test-list \
        test-unaligned \
        test-conf-files \
+       test-random-util \
        test-conf-parser \
        test-locale-util \
        test-copy \
@@ -638,6 +639,12 @@ test_copy_SOURCES = \
 test_copy_LDADD = \
        libshared.la
 
+test_random_util_SOURCES = \
+       src/test/test-random-util.c
+
+test_random_util_LDADD = \
+       libelogind-shared.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
@@ -749,9 +756,6 @@ test_selinux_LDADD = \
 test_sizeof_SOURCES = \
        src/test/test-sizeof.c
 
-test_sizeof_LDADD = \
-       libelogind-shared.la
-
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -900,7 +904,7 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
@@ -970,7 +974,6 @@ noinst_LTLIBRARIES += \
 
 EXTRA_DIST += \
        src/libelogind/libelogind.pc.in \
-       src/libelogind/sd-bus/DIFFERENCES \
        src/libelogind/sd-bus/GVARIANT-SERIALIZATION
 
 libelogind_la_SOURCES =
@@ -988,10 +991,15 @@ pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-login.h \
-       src/systemd/sd-messages.h \
-       src/systemd/sd-id128.h \
-       src/systemd/_sd-common.h
+       src/systemd/sd-bus.h          \
+       src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-bus-vtable.h   \
+       src/systemd/_sd-common.h      \
+       src/systemd/sd-daemon.h       \
+       src/systemd/sd-event.h        \
+       src/systemd/sd-id128.h        \
+       src/systemd/sd-login.h        \
+       src/systemd/sd-messages.h
 
 header-install-hook:
        $(MKDIR_P) $(DESTDIR)/$(pkgincludedir)
@@ -1015,6 +1023,7 @@ tests += \
        test-bus-server \
        test-bus-match \
        test-bus-introspect \
+       test-bus-vtable \
        test-bus-error \
        test-event
 
@@ -1030,6 +1039,12 @@ test_bus_server_SOURCES = \
 test_bus_server_LDADD = \
        libelogind-shared.la
 
+test_bus_vtable_SOURCES = \
+       src/libelogind/sd-bus/test-bus-vtable.c
+
+test_bus_vtable_LDADD = \
+       libelogind-shared.la
+
 test_bus_error_SOURCES = \
        src/libelogind/sd-bus/test-bus-error.c
 
@@ -1138,7 +1153,7 @@ endif
 noinst_LTLIBRARIES += \
        libelogind-core.la
 
-pkglibexec_PROGRAMS += \
+rootlibexec_PROGRAMS += \
        elogind
 
 loginctl_SOURCES = \
@@ -1195,10 +1210,10 @@ test_login_tables_LDADD = \
        libelogind-core.la
 
 manual_tests += \
-       test-login \
        test-inhibit
 
 tests += \
+       test-login \
        test-login-tables \
        test-login-shared
 
@@ -1248,8 +1263,7 @@ polkitpolicy_files += \
        src/login/org.freedesktop.login1.policy
 
 dist_udevrules_DATA += \
-       src/login/70-uaccess.rules \
-       src/login/70-power-switch.rules
+       src/login/70-uaccess.rules
 
 nodist_udevrules_DATA += \
        src/login/71-seat.rules \
@@ -1264,7 +1278,8 @@ gperf_gperf_sources = \
 EXTRA_DIST += \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
-       src/login/logind.conf.in
+       src/login/logind.conf.in \
+       src/login/org.freedesktop.login1.service.in
 
 # ------------------------------------------------------------------------------
 substitutions = \
@@ -1282,15 +1297,13 @@ substitutions = \
        '|exec_prefix=$(exec_prefix)|' \
        '|libdir=$(libdir)|' \
        '|includedir=$(includedir)|' \
-       '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
        '|KILL=$(KILL)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
        '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1316,6 +1329,9 @@ shell-completion/%: shell-completion/%.in
 %.conf: %.conf.in
        $(SED_PROCESS)
 
+%.login1.service: %.login1.service.in
+       $(SED_PROCESS)
+
 %.sh: %.sh.in
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
@@ -1349,8 +1365,10 @@ if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
        $(polkitpolicy_files)
 polkitrules_DATA = $(polkitrules_files)
+if ENABLE_POLKIT_PKLA
 polkitpkla_DATA = $(polkitpkla_files)
 endif
+endif
 
 EXTRA_DIST += \
        $(polkitpolicy_in_files)
@@ -1373,7 +1391,7 @@ XSLTPROC_FLAGS = \
        --stringparam funcsynopsis.style ansi \
        --stringparam man.authors.section.enabled 0 \
        --stringparam man.copyright.section.enabled 0 \
-       --stringparam elogind.version $(VERSION) \
+       --stringparam elogind.version $(PACKAGE_VERSION) \
        --path '$(builddir)/man:$(srcdir)/man'
 
 XSLTPROC_PROCESS_MAN = \
@@ -1463,38 +1481,43 @@ dist:
 
 .PHONY: git-tag
 git-tag:
-       git tag -s "v$(VERSION)" -m "elogind $(VERSION)"
+       git tag -s "v$(PACKAGE_VERSION)" -m "elogind $(PACKAGE_VERSION)"
 
 .PHONY: git-tar
 git-tar:
-       $(AM_V_at)git archive --format=tar --prefix=elogind-$(VERSION)-raw/ HEAD | \
+       $(AM_V_at)git archive --format=tar --prefix=elogind-$(PACKAGE_VERSION)-raw/ HEAD | \
                (cd /var/tmp/ && tar xf -)
-       $(AM_V_GEN)(cd /var/tmp && rm -rf elogind-$(VERSION) && $(MKDIR_P) elogind-$(VERSION) && \
-        for f in `find elogind-$(VERSION)-raw/ -type f | cut -d '/' -f 2-` ; do \
-               $(MKDIR_P) elogind-$(VERSION)/`dirname $$f` ;            \
-               $(AWK) 'BEGIN                    { i=0;e=0      }        \
-                       /^#if\s+0.*elogind.*$$/  { i=1;next     }        \
-                       /^#else\s*$$/            {                       \
-                           { if ( i==1 ) e=1; else print }{next}        \
-                       }                                                \
-                       /^#endif\s*\/\/\s*0\s*$$/ {                      \
-                           { if ( i==1 ) { i=0;e=0 } else print }{next} \
-                       }                                                \
-                       /^\s*\/\/\/.*elogind.*$$/{ next         }        \
-                       /^\s*\/\/\s*#include.+$$/{ next         }        \
-                       { if ( (i==0) || (e==1) ) print         }'       \
-                         elogind-$(VERSION)-raw/$$f                     \
-                       > elogind-$(VERSION)/$$f ;                       \
-                       chmod `stat -c '%a' elogind-$(VERSION)-raw/$$f`  \
-                                           elogind-$(VERSION)/$$f ;     \
-        done ; \
-        for l in `find elogind-$(VERSION)-raw/ -type l | cut -d '/' -f 2-` ; do \
-               $(MKDIR_P) elogind-$(VERSION)/`dirname $$l` ; \
-               cp -P elogind-$(VERSION)-raw/$$l elogind-$(VERSION)/$$l ; \
-        done ; \
-        tar czf elogind-$(VERSION).tar.gz elogind-$(VERSION) ; \
-        rm -rf elogind-$(VERSION) elogind-$(VERSION)-raw) ; \
-       $(AM_V_at)mv /var/tmp/elogind-$(VERSION).tar.gz ./
+       $(AM_V_GEN)(cd /var/tmp &&                                              \
+               rm -rf elogind-$(PACKAGE_VERSION) &&                            \
+               $(MKDIR_P) elogind-$(PACKAGE_VERSION) &&                        \
+        for f in `find elogind-$(PACKAGE_VERSION)-raw/ -type f |               \
+                       cut -d '/' -f 2-` ; do                                  \
+               $(MKDIR_P) elogind-$(PACKAGE_VERSION)/`dirname $$f` ;           \
+               $(AWK) 'BEGIN                    { i=0;e=0      }               \
+                       /^#if\s+0.*elogind.*$$/  { i=1;next     }               \
+                       /^#else\s*$$/            {                              \
+                           { if ( i==1 ) e=1; else print }{next}               \
+                       }                                                       \
+                       /^#endif\s*\/\/\s*0\s*$$/ {                             \
+                           { if ( i==1 ) { i=0;e=0 } else print }{next}        \
+                       }                                                       \
+                       /^\s*\/\/\/.*elogind.*$$/{ next         }               \
+                       /^\s*\/\/\s*#include.+$$/{ next         }               \
+                       { if ( (i==0) || (e==1) ) print         }'              \
+                         elogind-$(PACKAGE_VERSION)-raw/$$f                    \
+                       > elogind-$(PACKAGE_VERSION)/$$f ;                      \
+                       chmod `stat -c '%a' elogind-$(PACKAGE_VERSION)-raw/$$f` \
+                                           elogind-$(PACKAGE_VERSION)/$$f ;    \
+        done ;                                                                 \
+        for l in `find elogind-$(PACKAGE_VERSION)-raw/ -type l |               \
+                       cut -d '/' -f 2-` ; do                                  \
+               $(MKDIR_P) elogind-$(PACKAGE_VERSION)/`dirname $$l` ;           \
+               cp -P elogind-$(PACKAGE_VERSION)-raw/$$l                        \
+                       elogind-$(PACKAGE_VERSION)/$$l ;                        \
+        done ;                                                                 \
+        tar czf elogind-$(PACKAGE_VERSION).tar.gz elogind-$(PACKAGE_VERSION) ; \
+        rm -rf elogind-$(PACKAGE_VERSION) elogind-$(PACKAGE_VERSION)-raw) ;    \
+       $(AM_V_at)mv /var/tmp/elogind-$(PACKAGE_VERSION).tar.gz ./
 
 .PHONY: install-tree
 install-tree: all
Unnamed repository; edit this file 'description' to name the repository.