[CRIU] [PATCH v2 4/4] make: cleanup generic Makefile.inc a bit

Kinsbursky Stanislav skinsbursky at openvz.org
Wed Nov 7 05:43:33 EST 2012


From: Stanislav Kinsbursky <skinsbursky at openvz.org>

CFLAGS and LIBS are not required for sybsystems (pie, protobuf and syscalls)
build thus there no need to define them in Makefile.inc.

Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
---
 Makefile     |    2 ++
 Makefile.inc |    6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)
-------------- next part --------------
diff --git a/Makefile b/Makefile
index cfc7b3b..0d731cb 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,9 @@ SYSCALL-LIB	:= syscall/syscall-x86-64.o
 
 DEPS		:= $(patsubst %.o,%.d,$(OBJS))
 
+CFLAGS		+= -I./include -I./pie -fno-strict-aliasing
 MAKEFLAGS	+= --no-print-directory
+LIBS		+= -lprotobuf-c
 
 .PHONY: all zdtm test rebuild clean distclean tags cscope	\
 	docs help pie protobuf syscall
diff --git a/Makefile.inc b/Makefile.inc
index fd12927..4ba9e61 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -43,10 +43,6 @@ endif
 
 no-deps-targets := tags cscope clean cleanout cleandep realclean
 
-CFLAGS		+= -I./include -I./pie -fno-strict-aliasing
-
-LIBS		+= -lrt -lpthread -lprotobuf-c
-
 DEFINES		+= -D_FILE_OFFSET_BITS=64
 DEFINES		+= -D_GNU_SOURCE
 
@@ -68,4 +64,4 @@ endif
 WARNINGS	+= -Wall
 CFLAGS		+= $(WARNINGS) $(DEFINES)
 
-export CC ECHO MAKE CFLAGS LIBS ARCH DEFINES
+export CC ECHO MAKE CFLAGS ARCH DEFINES


More information about the CRIU mailing list