projects / packages / ipvsadm.git / blame
| Commit | Line | Data |
|---|---|---|
| 9c0cbef1 JB |
1 | --- ipvsadm-1.24/Makefile.orig 2004-10-27 17:53:07.000000000 +0200 |
| 2 | +++ ipvsadm-1.24/Makefile 2005-06-06 21:23:52.864458968 +0200 | |
| 3 | @@ -33,7 +33,7 @@ | |
| 4 | ARCH = $(shell uname -m) | |
| 5 | ||
| 6 | CC = gcc | |
| 7 | -INCLUDE = -I/usr/src/linux/include -I.. -I. | |
| 8 | +INCLUDE = -I.. -I. | |
| 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 JB |
15 | ifeq "${ARCH}" "sparc64" |
| 16 | - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2 -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow | |
| 17 | + CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow | |
| 18 | else | |
| 19 | - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2 | |
| 20 | + CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes | |
| 21 | endif | |
| 2df81ed7 | 22 | |
| 9c0cbef1 JB |
23 | |
| 24 | @@ -60,14 +60,7 @@ | |
| 25 | fi ) | |
| 2df81ed7 JB |
26 | |
| 27 | ifeq (,$(FORCE_GETOPT)) | |
| 9c0cbef1 | 28 | -LIB_SEARCH = /lib /usr/lib /usr/local/lib |
| 2df81ed7 JB |
29 | -POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ |
| 30 | - if [ -f $$i/libpopt.a ]; then \ | |
| 31 | - if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ | |
| 32 | - echo "-L$$i -lpopt"; \ | |
| 33 | - fi; \ | |
| 34 | - fi; \ | |
| 35 | -done) | |
| 36 | +POPT_LIB = -lpopt | |
| 37 | endif | |
| 38 | ||
| 39 | ifneq (,$(POPT_LIB)) | |
| 9c0cbef1 JB |
40 | @@ -78,7 +71,7 @@ |
| 41 | LIBS = $(POPT_LIB) | |
| 42 | DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \ | |
| 43 | $(POPT_DEFINE) | |
| 44 | -DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \ | |
| 45 | +DEFINES += $(shell if [ ! -f ip_vs.h ]; then \ | |
| 46 | echo "-DHAVE_NET_IP_VS_H"; fi;) | |
| 47 | ||
| 2df81ed7 | 48 | |
| 9c0cbef1 JB |
49 | @@ -94,7 +87,7 @@ |
| 50 | ||
| 51 | install: all | |
| 2df81ed7 JB |
52 | if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi |
| 53 | - $(INSTALL) -m 0755 -s ipvsadm $(SBIN) | |
| 54 | + $(INSTALL) -m 0755 ipvsadm $(SBIN) | |
| 55 | $(INSTALL) -m 0755 ipvsadm-save $(SBIN) | |
| 56 | $(INSTALL) -m 0755 ipvsadm-restore $(SBIN) | |
| 57 | [ -d $(MAN) ] || $(MKDIR) -p $(MAN) | |
| 9c0cbef1 JB |
58 | --- ipvsadm-1.24/libipvs/Makefile.orig 2002-12-19 14:53:07.000000000 +0100 |
| 59 | +++ ipvsadm-1.24/libipvs/Makefile 2005-06-06 21:25:13.995125232 +0200 | |
| 60 | @@ -1,12 +1,12 @@ | |
| 61 | # Makefile for libipvs | |
| 62 | ||
| 63 | CC = gcc | |
| 64 | -INCLUDE = -I/usr/src/linux/include | |
| 65 | -CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2 | |
| 66 | +INCLUDE = | |
| 67 | +CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes | |
| 68 | ||
| 69 | -INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ | |
| 70 | - echo "-I../../."; fi;) | |
| 71 | -DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \ | |
| 72 | +INCLUDE += $(shell if [ -f ../ip_vs.h ]; then \ | |
| 73 | + echo "-I.."; fi;) | |
| 74 | +DEFINES = $(shell if [ ! -f ../ip_vs.h ]; then \ | |
| 75 | echo "-DHAVE_NET_IP_VS_H"; fi;) | |
| 76 | ||
| 77 | .PHONY = all clean install dist distclean rpm rpms |