From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB950138350 for ; Wed, 22 Apr 2020 22:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCACBE0BF0; Wed, 22 Apr 2020 22:13:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B82E2E0BF0 for ; Wed, 22 Apr 2020 22:13:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 159C334EFA0 for ; Wed, 22 Apr 2020 22:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B80D2150 for ; Wed, 22 Apr 2020 22:08:40 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1587593060.79f7650b59c4f9261b5e9e76e3c57cfc90b2dc6b.blueness@gentoo> Subject: [gentoo-commits] proj/eudev:master commit in: test/, src/libudev/, src/udev/, rules/ X-VCS-Repository: proj/eudev X-VCS-Files: rules/Makefile.am src/libudev/Makefile.am src/udev/Makefile.am test/Makefile.am X-VCS-Directories: src/libudev/ test/ rules/ src/udev/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 79f7650b59c4f9261b5e9e76e3c57cfc90b2dc6b X-VCS-Branch: master Date: Wed, 22 Apr 2020 22:08:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5468bd7e-c5a7-420e-a049-a7c75acbda1e X-Archives-Hash: 5d72d346245311d072b48cb35d16f080 commit: 79f7650b59c4f9261b5e9e76e3c57cfc90b2dc6b Author: Ethan Sommer gmail com> AuthorDate: Tue Apr 21 18:31:49 2020 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Apr 22 22:04:20 2020 +0000 URL: https://gitweb.gentoo.org/proj/eudev.git/commit/?id=79f7650b switch make usage to be POSIX compatible Signed-off-by: Anthony G. Basile gentoo.org> rules/Makefile.am | 7 +++++-- src/libudev/Makefile.am | 19 ++++++++----------- src/udev/Makefile.am | 13 ++++++------- test/Makefile.am | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/rules/Makefile.am b/rules/Makefile.am index 6143851a9..96895ff8f 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} EXTRA_DIST = \ 64-btrfs.rules.in +CLEANFILES = \ + 64-btrfs.rules + dist_udevrules_DATA = \ 50-udev-default.rules \ 60-block.rules \ @@ -46,8 +49,8 @@ endif do_subst = $(SED) \ -e 's,[@]bindir[@],$(bindir),g' -64-btrfs.rules: 64-btrfs.rules.in Makefile - $(do_subst) < $< > $@ +64-btrfs.rules: $(srcdir)/64-btrfs.rules.in Makefile + $(do_subst) $(srcdir)/64-btrfs.rules.in > 64-btrfs.rules install-data-local: $(MKDIR_P) $(DESTDIR)$(udevconfdir)/rules.d diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am index 0edb8732d..d069956b3 100644 --- a/src/libudev/Makefile.am +++ b/src/libudev/Makefile.am @@ -4,16 +4,6 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=3 LIBUDEV_AGE=6 -define move-to-rootlibdir - if test "$(libdir)" != "$(rootlibdir)"; then \ - $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ - so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ - so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ - $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ - mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ - fi -endef - AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DUDEV_ROOT_RUN=\"$(rootrundir)\" \ @@ -80,7 +70,14 @@ CLEANFILES = \ libudev.pc install-exec-hook: - libname=libudev.so && $(move-to-rootlibdir) + libname=libudev.so; if test "$(libdir)" != "$(rootlibdir)"; then \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\)\?[^/]\+,..,g') && \ + $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ + mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ + fi + uninstall-hook: rm -f $(DESTDIR)$(rootlibdir)/libudev.so* diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index 401af01c9..9b4917ad9 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -113,17 +113,17 @@ nodist_libudev_core_la_SOURCES = \ keyboard-keys-to-name.h keyboard-keys.txt: Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_at)f="$@"; case $$f in */*) $(MKDIR_P) "$${f%/*}"; esac $(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/' > $@ keyboard-keys-from-name.gperf: keyboard-keys.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' keyboard-keys.txt > $@ keyboard-keys-from-name.h: keyboard-keys-from-name.gperf Makefile - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@ + $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < keyboard-keys-from-name.gperf > $@ keyboard-keys-to-name.h: keyboard-keys.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' keyboard-keys.txt > $@ BUILT_SOURCES = \ @@ -136,9 +136,8 @@ CLEANFILES += \ # install udevadm symlink in sbindir install-exec-hook: - if test "$(bindir)" != "$(sbindir)"; then \ - $(LN_S) -n -f $(bindir)/udevadm $(DESTDIR)$(sbindir)/udevadm; \ - fi + test "$(bindir)" = "$(sbindir)" || \ + $(LN_S) -n -f $(bindir)/udevadm $(DESTDIR)$(sbindir)/udevadm uninstall-hook: rm -Rf $(DESTDIR)$(sbindir)/udevadm diff --git a/test/Makefile.am b/test/Makefile.am index 6d9c77624..b24fda9b4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -50,7 +50,7 @@ check_DATA = \ test/sys test/sys: - $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_at)f="$@"; $(MKDIR_P) "$${f%/*}" $(AM_V_GEN)tar -C $(top_builddir)/test/test -xJf $(top_srcdir)/test/sys.tar.xz test-sys-distclean: