From 00119f63fa91ee3612a95b91872abc89ac6ff7e1 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 4 Nov 2014 01:40:42 +0000
Subject: [PATCH] ioctlsort: rewrite build rules using noinst_PROGRAMS
* linux/ioctlsort.c: Rename to ioctlsort.c
* Makefile.am (EXTRA_DIST): Rename linux/ioctlsort.c to ioctlsort.c.
[MAINTAINER_MODE] (noinst_PROGRAMS): Add ioctlsort.
(ioctlsort_SOURCES): Add ioctlsort.c.
(nodist_ioctlsort_SOURCES): Add ioctls.h and ioctldefs.h.
(CLEANFILES): Add $(nodist_ioctlsort_SOURCES).
(ioctlsort.$(OBJEXT)): Likewise.
(ioctlsort): Remove.
---
Makefile.am | 43 ++++++++++++++++----------------
linux/ioctlsort.c => ioctlsort.c | 0
2 files changed, 21 insertions(+), 22 deletions(-)
rename linux/ioctlsort.c => ioctlsort.c (100%)
diff --git a/Makefile.am b/Makefile.am
index 5f98cd63..f046e0c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,6 +96,7 @@ EXTRA_DIST = \
debian/strace64.manpages \
debian/watch \
errnoent.sh \
+ ioctlsort.c \
linux/aarch64/errnoent1.h \
linux/aarch64/ioctlent.h.in \
linux/aarch64/ioctlent1.h \
@@ -130,7 +131,6 @@ EXTRA_DIST = \
linux/inotify.h \
linux/ioctlent.h.in \
linux/ioctlent.sh \
- linux/ioctlsort.c \
linux/kexec.h \
linux/keyctl.h \
linux/m68k/ioctlent.h.in \
@@ -260,6 +260,17 @@ news-check: NEWS
exit 1; \
fi
+ioctlent_h = $(builddir)/$(OS)/ioctlent.h
+BUILT_SOURCES += $(ioctlent_h)
+CLEANFILES = $(ioctlent_h)
+ioctlent_h_deps = $(srcdir)/$(OS)/ioctlent.h.in $(srcdir)/$(OS)/$(ARCH)/ioctlent.h.in
+$(ioctlent_h): $(top_builddir)/config.status $(ioctlent_h_deps)
+ $(MKDIR_P) $(builddir)/$(OS)
+ cat $(ioctlent_h_deps) | \
+ $(COMPILE) -E -P - | \
+ sed 's/^\([[:space:]]*{\)"[^"]\+",[[:space:]]*/\1/' | \
+ LC_ALL=C sort -u -k2,2 -k1,1 > $@
+
if MAINTAINER_MODE
gen_changelog_start_date = 2009-07-08 20:00
@@ -297,31 +308,19 @@ KERNEL_INCLUDE = \
$(INCLUDEDIR)
IOCTLDIR = $(shell find $(KERNEL_INCLUDE) -maxdepth 0 -type d -print -quit 2>/dev/null)
IOCTLASM = $(INCLUDEDIR)/asm
-IOCTLSORT_INCLUDEDIR = $(INCLUDEDIR)
-ioctlent_h_in = linux/ioctlent.h.in
+noinst_PROGRAMS = ioctlsort
+ioctlsort_SOURCES = ioctlsort.c
+nodist_ioctlsort_SOURCES = ioctls.h ioctldefs.h
+CLEANFILES += $(nodist_ioctlsort_SOURCES)
+ioctlsort.$(OBJEXT): $(nodist_ioctlsort_SOURCES)
+ioctls.h: $(srcdir)/linux/ioctlent.sh
+ $(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
+ioctldefs.h: ioctls.h ;
+ioctlent_h_in = linux/ioctlent.h.in
BUILT_SOURCES += $(ioctlent_h_in)
-
$(srcdir)/$(ioctlent_h_in): ioctlsort
$(<D)/$(<F) > $@
-ioctlsort: $(srcdir)/linux/ioctlsort.c ioctls.h ioctldefs.h
- $(filter-out -I%,$(LINK.c)) -I. -I$(IOCTLSORT_INCLUDEDIR) \
- $(filter -I%,$(LINK.c)) \
- -o $@ $<
-ioctls.h: $(srcdir)/linux/ioctlent.sh
- $(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
-ioctldefs.h: ioctls.h ;
endif
-
-ioctlent_h = $(builddir)/$(OS)/ioctlent.h
-BUILT_SOURCES += $(ioctlent_h)
-CLEANFILES = $(ioctlent_h)
-ioctlent_h_deps = $(srcdir)/$(OS)/ioctlent.h.in $(srcdir)/$(OS)/$(ARCH)/ioctlent.h.in
-$(ioctlent_h): $(top_builddir)/config.status $(ioctlent_h_deps)
- $(MKDIR_P) $(builddir)/$(OS)
- cat $(ioctlent_h_deps) | \
- $(COMPILE) -E -P - | \
- sed 's/^\([[:space:]]*{\)"[^"]\+",[[:space:]]*/\1/' | \
- LC_ALL=C sort -u -k2,2 -k1,1 > $@
diff --git a/linux/ioctlsort.c b/ioctlsort.c
similarity index 100%
rename from linux/ioctlsort.c
rename to ioctlsort.c
--
2.40.0