[CRIU] [PATCH 1/4] Makefile.inc: restore

Kir Kolyshkin kir at openvz.org
Tue Apr 23 18:12:44 EDT 2013


This reverts part of commit a519e0c which broke the man page build:

	[kir at kirpad Documentation]$ make
	"  GEN     " crtools.1
	/bin/sh:   GEN     : command not found
	make: *** [crtools.1] Error 127

So let's reintroduce Q and E in a separate Makefile.inc as it was
before.

Cc: Stanislav Kinsbursky <skinsbursky at openvz.org>
Cc: Cyrill Gorcunov <gorcunov at openvz.org>
Cc: Pavel Emelyanov <xemul at parallels.com>
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 Makefile     | 11 +++--------
 Makefile.inc | 11 +++++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 Makefile.inc

diff --git a/Makefile b/Makefile
index 0d33cc3..4efe6b8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,11 @@ export VERSION_MAJOR VERSION_MINOR VERSION_SUBLEVEL VERSION_EXTRA VERSION_NAME
 #
 #MAKEFLAGS := -r -R --no-print-directory
 
+include Makefile.inc
+
 #
 # Common definitions
 #
-ifeq ($(strip $(V)),)
-	E = @echo
-	Q = @
-else
-	E = @\#
-	Q =
-endif
 
 FIND		:= find
 CSCOPE		:= cscope
@@ -103,7 +98,7 @@ CFLAGS		+= $(WARNINGS) $(DEFINES)
 SYSCALL-LIB	:= arch/$(ARCH)/syscalls.built-in.o
 ARCH-LIB	:= arch/$(ARCH)/crtools.built-in.o
 
-export E Q CC ECHO MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS
+export CC ECHO MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS
 export SRC_DIR SYSCALL-LIB SH RM ARCH_DIR OBJCOPY LDARCH LD
 export cflags-y
 
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 0000000..f11cdcc
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,11 @@
+# Silent make rules
+
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
+export E Q
-- 
1.8.1.4



More information about the CRIU mailing list