]>
Commit | Line | Data |
---|---|---|
115e3771 JB |
1 | --- ipvsadm-1.26/Makefile.orig 2004-10-27 17:53:07.000000000 +0200 |
2 | +++ ipvsadm-1.26/Makefile 2005-06-06 21:23:52.864458968 +0200 | |
9c0cbef1 JB |
3 | @@ -33,7 +33,7 @@ |
4 | ARCH = $(shell uname -m) | |
5 | ||
6 | CC = gcc | |
04dff8f4 | 7 | -INCLUDE = |
8 | +INCLUDE = | |
9c0cbef1 JB |
9 | SBIN = $(BUILD_ROOT)/sbin |
10 | MANDIR = usr/man | |
11 | MAN = $(BUILD_ROOT)/$(MANDIR)/man8 | |
12 | @@ -43,9 +43,9 @@ | |
13 | STATIC_LIBS = libipvs/libipvs.a | |
2df81ed7 | 14 | |
ba0d2d2a | 15 | ifeq "${ARCH}" "sparc64" |
04dff8f4 | 16 | - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow |
ba0d2d2a JB |
17 | + CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow |
18 | else | |
04dff8f4 | 19 | - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g |
ba0d2d2a JB |
20 | + CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes |
21 | endif | |
2df81ed7 | 22 | |
9c0cbef1 | 23 | |
115e3771 | 24 | @@ -78,7 +71,5 @@ |
9c0cbef1 JB |
25 | LIBS = $(POPT_LIB) |
26 | DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \ | |
aff2f519 | 27 | -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE) |
9c0cbef1 | 28 | -DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \ |
115e3771 | 29 | - echo "-DHAVE_NET_IP_VS_H"; fi;) |
9c0cbef1 | 30 | |
2df81ed7 | 31 | |
51f04a91 JB |
32 | --- ipvsadm-1.27/libipvs/Makefile.orig 2013-09-09 20:55:27.408302252 +0200 |
33 | +++ ipvsadm-1.27/libipvs/Makefile 2013-09-09 20:57:00.548298367 +0200 | |
34 | @@ -1,7 +1,7 @@ | |
9c0cbef1 JB |
35 | # Makefile for libipvs |
36 | ||
37 | CC = gcc | |
04dff8f4 | 38 | -CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC |
39 | +CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes -fPIC | |
40 | ifneq (0,$(HAVE_NL)) | |
41 | CFLAGS += -DLIBIPVS_USE_NL | |
51f04a91 JB |
42 | CFLAGS += $(shell \ |
43 | @@ -13,10 +13,6 @@ | |
44 | fi) | |
04dff8f4 | 45 | endif |
9c0cbef1 JB |
46 | |
47 | -INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ | |
48 | - echo "-I../../."; fi;) | |
49 | -DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \ | |
115e3771 | 50 | - echo "-DHAVE_NET_IP_VS_H"; fi;) |
51f04a91 JB |
51 | DEFINES += $(shell if which pkg-config > /dev/null 2>&1; then \ |
52 | if pkg-config --exists libnl-3.0; then :; \ | |
53 | elif pkg-config --exists libnl-2.0; then :; \ |