X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=9062dd65dfb9835bdfce7684468841b5b2131d8f;hp=00ed3016fc2e815e3159e825dfcff10fb956d450;hb=dbf61afb29e016fe1b4ac48312a782df1d60a3e6;hpb=6c1f3ba54ac1f42598c543b86daaf294b29294b1

diff --git a/Makefile.am b/Makefile.am
index 00ed3016f..9062dd65d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,29 +26,29 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
-LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=0
+LIBUDEV_CURRENT=2
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=3
+LIBSYSTEMD_DAEMON_REVISION=4
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=7
+LIBSYSTEMD_ID128_REVISION=8
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=3
+LIBSYSTEMD_JOURNAL_CURRENT=4
 LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=3
+LIBSYSTEMD_JOURNAL_AGE=4
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -148,10 +148,11 @@ AM_CPPFLAGS = \
 	-I $(top_builddir)/src/core \
 	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/libudev \
-	-I $(top_srcdir)/src/udev
+	-I $(top_srcdir)/src/udev \
+	$(OUR_CPPFLAGS)
 
-AM_CFLAGS = $(WARNINGFLAGS)
-AM_LDFLAGS = $(GCLDFLAGS)
+AM_CFLAGS = $(OUR_CFLAGS)
+AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
 if TARGET_GENTOO
@@ -386,7 +387,6 @@ EXTRA_DIST += \
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
 	units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -395,7 +395,6 @@ endif
 
 if TARGET_MANDRIVA
 dist_systemunit_DATA += \
-	units/mandriva/prefdm.service \
 	units/fedora/rc-local.service \
 	units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -417,7 +416,6 @@ endif
 
 if TARGET_MAGEIA
 dist_systemunit_DATA += \
-	units/mageia/prefdm.service \
 	units/fedora/rc-local.service \
 	units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
@@ -557,6 +555,7 @@ MANPAGES_ALIAS = \
 	man/sd_journal_printv.3 \
 	man/sd_journal_send.3 \
 	man/sd_journal_sendv.3 \
+	man/sd_journal_perror.3 \
 	man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
 	man/sd_journal_open_directory.3 \
 	man/sd_journal_close.3 \
@@ -624,6 +623,7 @@ man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
 man/sd_journal_printv.3: man/sd_journal_print.3
 man/sd_journal_send.3: man/sd_journal_print.3
 man/sd_journal_sendv.3: man/sd_journal_print.3
+man/sd_journal_perror.3: man/sd_journal_print.3
 man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
 man/sd_journal_open_directory.3: man/sd_journal_open.3
 man/sd_journal_close.3: man/sd_journal_open.3
@@ -677,8 +677,8 @@ CLEANFILES += \
 	man/index.html
 
 man/index.html: make-man-index.py $(XML_FILES)
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(PYTHON) $^ > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 EXTRA_DIST += \
 	man/index.html
@@ -1011,8 +1011,8 @@ libsystemd_core_la_LIBADD = \
 	$(KMOD_LIBS)
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
 EXTRA_DIST += \
 	src/core/load-fragment-gperf.gperf.m4
@@ -1029,15 +1029,19 @@ BUILT_SOURCES += \
 	src/core/syscall-to-name.h
 
 src/core/syscall-list.txt: Makefile
-	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
 
 src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
 
 src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
 
 src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
@@ -1394,6 +1398,7 @@ systemd_remount_fs_SOURCES = \
 	src/core/mount-setup.h
 
 systemd_remount_fs_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1421,8 +1426,6 @@ systemctl_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-journal-internal.la \
-	libsystemd-id128-internal.la \
 	libsystemd-dbus.la \
 	libsystemd-logs.la
 
@@ -1515,7 +1518,7 @@ pkginclude_HEADERS += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
@@ -1626,7 +1629,7 @@ CLEANFILES += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-move-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
@@ -1659,19 +1662,19 @@ libudev_private_la_LIBADD = \
 MANPAGES += \
 	man/udev.7 \
 	man/udevadm.8 \
-	man/systemd-udevd.8
+	man/systemd-udevd.service.8
 
 MANPAGES_ALIAS += \
-	man/systemd-udevd.service.8 \
+	man/systemd-udevd.8 \
 	man/systemd-udevd-control.socket.8 \
 	man/systemd-udevd-kernel.socket.8
 
-man/systemd-udevd.service.8: man/systemd-udevd.8
-man/systemd-udevd-control.socket.8: man/systemd-udevd.8
-man/systemd-udevd-kernel.socket.8: man/systemd-udevd.8
+man/systemd-udevd.8: man/systemd-udevd.service.8
+man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
 
 udev-confdirs:
-	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+	-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1717,10 +1720,10 @@ CLEANFILES += \
 	units/systemd-udev-settle.service
 
 systemd-install-hook:
-	mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
+	$(MKDIR_P) $(DESTDIR)$(systemunitdir)/sockets.target.wants
 	ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
 	ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
-	mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	$(MKDIR_P) $(DESTDIR)$(systemunitdir)/sysinit.target.wants
 	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
 	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
@@ -1836,7 +1839,8 @@ check_DATA += \
 
 # packed sysfs test tree
 test/sys:
-	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
 	-rm -rf test/sys
@@ -2002,19 +2006,17 @@ libgudev_1_0_la_LDFLAGS = \
 	-export-symbols-regex '^g_udev_.*'
 
 src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
 src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
-	$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)echo '#include "gudevmarshal.h"' > $@ && \
 	glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
-	$(AM_V_GEN)glib-mkenums --template $^ > \
-	    $@.tmp && mv $@.tmp $@
-
-src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
-	$(AM_V_GEN)glib-mkenums --template $^ > \
-	    $@.tmp && mv $@.tmp $@
+src/gudev/gudevenumtypes.%: src/gudev/gudevenumtypes.%.template src/gudev/gudevenums.h
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)glib-mkenums --template $^ > $@
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
@@ -2039,16 +2041,16 @@ src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
 	--warn-all
 
 src_gudev_GUdev_1_0_gir_FILES = \
-	$(top_srcdir)/src/gudev/gudev.h \
-	$(top_srcdir)/src/gudev/gudevtypes.h \
-	$(top_srcdir)/src/gudev/gudevenums.h \
-	$(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
-	$(top_srcdir)/src/gudev/gudevclient.h \
-	$(top_srcdir)/src/gudev/gudevdevice.h \
-	$(top_srcdir)/src/gudev/gudevenumerator.h \
-	$(top_srcdir)/src/gudev/gudevclient.c \
-	$(top_srcdir)/src/gudev/gudevdevice.c \
-	$(top_srcdir)/src/gudev/gudevenumerator.c
+	src/gudev/gudev.h \
+	src/gudev/gudevtypes.h \
+	src/gudev/gudevenums.h \
+	src/gudev/gudevenumtypes.h \
+	src/gudev/gudevclient.h \
+	src/gudev/gudevdevice.h \
+	src/gudev/gudevenumerator.h \
+	src/gudev/gudevclient.c \
+	src/gudev/gudevdevice.c \
+	src/gudev/gudevenumerator.c
 
 INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
 INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
@@ -2067,7 +2069,7 @@ endif # HAVE_INTROSPECTION
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libgudev-install-move-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
@@ -2202,8 +2204,8 @@ dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
-	$(AM_V_at)mkdir -p src/udev/keymap
-	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
@@ -2282,7 +2284,7 @@ pkgconfiglib_DATA += \
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
@@ -2446,7 +2448,7 @@ endif
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
@@ -3172,7 +3174,7 @@ endif
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-login-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
@@ -3381,12 +3383,12 @@ src/%.policy.in: src/%.policy.in.in Makefile
 	$(AM_V_GEN)chmod +x $@
 
 src/%.c: src/%.gperf
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(GPERF) < $< > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(GPERF) < $< > $@
 
 src/%: src/%.m4
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) < $< > $@
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(M4) -P $(M4_DEFINES) < $< > $@
 
 M4_PROCESS_SYSTEM = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -3458,7 +3460,7 @@ CLEANFILES += \
 	${XML_FILES:.xml=.html}
 endif
 
-DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 CLEANFILES += \
 	$(dbusinterface_DATA)
@@ -3590,15 +3592,12 @@ systemd-install-data-hook:
 if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service single.service && \
-		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) rescue.service single.service )
 endif
 
 if TARGET_MANDRIVA
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service dm.service single.service && \
-		$(LN_S) prefdm.service display-manager.service && \
-		$(LN_S) prefdm.service dm.service && \
 		$(LN_S) rescue.service single.service )
 endif
 
@@ -3616,9 +3615,7 @@ endif
 
 if TARGET_MAGEIA
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) prefdm.service display-manager.service && \
-		$(LN_S) prefdm.service dm.service )
+		rm -f display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)