hashmap: document trivial_hash_func()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d4c2f8577d6a27ccc1e970ffd74cae11af51daa4..96f80d73c1b096777cbb24ea10c5e8a94861eb05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,27 +32,27 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=6
+LIBSYSTEMD_LOGIN_CURRENT=7
 LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=6
+LIBSYSTEMD_LOGIN_AGE=7
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=21
+LIBSYSTEMD_ID128_REVISION=22
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=10
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=10
 
 # Dirs of external packages
@@ -90,6 +90,7 @@ udevhomedir=$(udevlibexecdir)
 udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
+kernelinstalldir = $(prefix)/lib/kernel/install.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -137,12 +138,11 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
-       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
+       -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
@@ -164,6 +164,7 @@ AM_CPPFLAGS = \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DQUOTACHECK=\"$(QUOTACHECK)\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/login \
@@ -291,11 +292,12 @@ bin_PROGRAMS = \
        systemd-delta \
        systemd-analyze
 
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
 
-EXTRA_DIST += \
-       src/kernel-install/kernel-install
+dist_kernelinstall_SCRIPTS = \
+       src/kernel-install/50-depmod.install \
+       src/kernel-install/90-loaderentry.install
 
 rootlibexec_PROGRAMS = \
        systemd \
@@ -640,6 +642,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fdset.h \
        src/shared/prioq.c \
        src/shared/prioq.h \
+       src/shared/sleep-config.c \
+       src/shared/sleep-config.h \
        src/shared/strv.c \
        src/shared/strv.h \
        src/shared/env-util.c \