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

[Kinsbursky Stanislav]

From: Stanislav Kinsbursky <skinsbursky at openvz.org>

Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
---
 pie/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 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
diff --git a/pie/Makefile b/pie/Makefile
index 48a721f..dcef8d5 100644
--- a/pie/Makefile
+++ b/pie/Makefile
@@ -13,10 +13,9 @@ ASMFLAGS	:= -D__ASSEMBLY__
 CFLAGS		+=  -fpie  -Wa,--noexecstack -fno-strict-aliasing
 CFLAGS		+= -I../include/ -I../protobuf/ -I../syscall/
 
-SYSCALL-LIB	:= ../syscall/syscall-x86-64.o
-
 .DEFAULT_GOAL	:= pie
 
+SYSCALL-LIB	:= ../syscall/syscall-x86-64.o
 LIB-OBJS	:= util-net.o log-simple.o $(SYSCALL-LIB)
 
 $(PARASITE): $(LIB-OBJS) $(PASM-OBJS)