1From 801224257015788d3aff026bf2ae1cd8531d4fcc Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Wed, 25 Jul 2018 13:12:04 +0800 4Subject: [PATCH] Modify the Makefile for cross compile. 5 6Upstream-Status: Inappropriate [embedded specific] 7 8Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> 9 10update to version 1.29 11 12Signed-off-by: Changqing Li <changqing.li@windriver.com> 13--- 14 Makefile | 9 ++++----- 15 libipvs/Makefile | 3 +-- 16 2 files changed, 5 insertions(+), 7 deletions(-) 17 18diff --git a/Makefile b/Makefile 19index 91a2991..906086d 100644 20--- a/Makefile 21+++ b/Makefile 22@@ -35,10 +35,9 @@ ARCH = $(shell uname -m) 23 RPMSOURCEDIR = $(shell rpm --eval '%_sourcedir') 24 RPMSPECDIR = $(shell rpm --eval '%_specdir') 25 26-CC = gcc 27 INCLUDE = 28 SBIN = $(BUILD_ROOT)/sbin 29-MANDIR = usr/man 30+MANDIR = usr/share/man 31 MAN = $(BUILD_ROOT)/$(MANDIR)/man8 32 INIT = $(BUILD_ROOT)/etc/rc.d/init.d 33 MKDIR = mkdir 34@@ -81,13 +80,13 @@ DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \ 35 36 .PHONY = all clean install dist distclean rpm rpms 37 38-all: libs ipvsadm 39+all: ipvsadm 40 41 libs: 42 make -C libipvs 43 44-ipvsadm: $(OBJS) $(STATIC_LIBS) 45- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) 46+ipvsadm: $(OBJS) libs 47+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) 48 49 install: all 50 if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi 51diff --git a/libipvs/Makefile b/libipvs/Makefile 52index f845c8b..dafab30 100644 53--- a/libipvs/Makefile 54+++ b/libipvs/Makefile 55@@ -1,6 +1,5 @@ 56 # Makefile for libipvs 57 58-CC = gcc 59 CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC 60 ifneq (0,$(HAVE_NL)) 61 CFLAGS += -DLIBIPVS_USE_NL 62@@ -30,7 +29,7 @@ SHARED_LIB = libipvs.so 63 all: $(STATIC_LIB) $(SHARED_LIB) 64 65 $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o 66- ar rv $@ $^ 67+ $(AR) rv $@ $^ 68 69 $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o 70 $(CC) -shared -Wl,-soname,$@ -o $@ $^ 71-- 722.7.4 73 74