Makefile: fix CPPFLAGS handling

This code doesn't respect CPPFLAGS at all.  Fix that and move the
existing -D flags to the right variable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2013-09-17 00:18:15 -04:00
parent 4fafb3d376
commit 8252ecf307
1 changed files with 3 additions and 3 deletions

View File

@ -23,18 +23,18 @@ OBJS=common.o sslh-main.o probe.o
ifneq ($(strip $(USELIBWRAP)),) ifneq ($(strip $(USELIBWRAP)),)
LIBS:=$(LIBS) -lwrap LIBS:=$(LIBS) -lwrap
CFLAGS:=$(CFLAGS) -DLIBWRAP CPPFLAGS+=-DLIBWRAP
endif endif
ifneq ($(strip $(USELIBCONFIG)),) ifneq ($(strip $(USELIBCONFIG)),)
LIBS:=$(LIBS) -lconfig LIBS:=$(LIBS) -lconfig
CFLAGS:=$(CFLAGS) -DLIBCONFIG CPPFLAGS+=-DLIBCONFIG
endif endif
all: sslh $(MAN) echosrv all: sslh $(MAN) echosrv
.c.o: *.h .c.o: *.h
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
version.h: version.h:
./genver.sh >version.h ./genver.sh >version.h