X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=03e28e8c347ca6d89bd1c0c62588eb81dbbcc213;hb=3b0810c53c6adfa2f436540369b8969ae75d7fcf;hp=98a85063ca1e9cc7a8f8dd1fc56c9ac900f6dfb5;hpb=8e8eb8fbafcaa841fa5393e396acde27b26edf2f;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 98a85063c..03e28e8c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ LIBUDEV_REVISION=1
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
+LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
@@ -57,6 +57,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
+rpmmacrosdir=$(sysconfdir)/rpm
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -885,8 +886,12 @@ org.freedesktop.systemd1.%.xml: systemd
 pkgconfigdata_DATA = \
 	src/core/systemd.pc
 
+nodist_rpmmacros_DATA = \
+	src/core/macros.systemd
+
 EXTRA_DIST += \
-	src/core/systemd.pc.in
+	src/core/systemd.pc.in \
+	src/core/macros.systemd.in
 
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
@@ -2372,39 +2377,24 @@ endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
+systemd_readahead_SOURCES = \
+	src/readahead/readahead.c \
 	src/readahead/readahead-collect.c \
-	src/readahead/readahead-common.c \
-	src/readahead/readahead-common.h
-
-systemd_readahead_collect_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-daemon.la \
-	libudev.la
-
-systemd_readahead_replay_SOURCES = \
 	src/readahead/readahead-replay.c \
+	src/readahead/readahead-analyze.c \
 	src/readahead/readahead-common.c \
 	src/readahead/readahead-common.h
 
-systemd_readahead_replay_LDADD = \
+systemd_readahead_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
 	libudev.la
 
-systemd_readahead_analyze_SOURCES = \
-	src/readahead/readahead-analyze.c \
-	src/readahead/readahead-common.h
-
 pkginclude_HEADERS += \
 	src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
-	systemd-readahead-collect \
-	systemd-readahead-replay
-
-bin_PROGRAMS += \
-	systemd-readahead-analyze
+	systemd-readahead
 
 dist_systemunit_DATA += \
 	units/systemd-readahead-drop.service \
@@ -3015,6 +3005,9 @@ sysctl.d/%: sysctl.d/%.in Makefile
 %.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
+src/core/macros.%: src/core/macros.%.in Makefile
+	$(SED_PROCESS)
+
 src/%.policy.in: src/%.policy.in.in Makefile
 	$(SED_PROCESS)