Fix distcheck

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d56edec2ea79f092c58a2d8027e8aae48065dfab..761ba27b2e11f68b6ccb5f160c6121f370024f31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,10 +207,6 @@ 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)
 
@@ -420,6 +416,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 \
@@ -734,10 +731,26 @@ INSTALL_EXEC_HOOKS += libelogind-install-hook
 UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
 
 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 = \
@@ -809,8 +822,7 @@ 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
@@ -844,7 +856,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
@@ -1094,26 +1107,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-split-usr \
        --enable-kdbus
 
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-sysvinit-path= \
-       --with-sysvrcnd-path=
-
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
 endif
-
-#
-# Require python when making dist
-#
-.PHONY: dist-check-help
-
-dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
-       for i in $(abspath $^); do                                             \
-            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
-               echo "$(basename $$i) --help output is too wide:";             \
-               $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
-               exit 1;                                                        \
-            fi; done
-
-dist: dist-check-python