status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makefile: use CPPFLAGS instead of CFLAGS for -D

This commit is contained in:
Thomas Bernard 2021-05-23 00:13:44 +02:00
parent 2cc539ae27
commit 2c4acd0d50
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
miniupnpc/Makefile
View File

@ -34,19 +34,19 @@ CFLAGS ?= -O
CFLAGS += -Wall CFLAGS += -Wall
CFLAGS += -W -Wstrict-prototypes CFLAGS += -W -Wstrict-prototypes
CFLAGS += -fno-common CFLAGS += -fno-common
CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT CPPFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
CFLAGS += -DMINIUPNPC_GET_SRC_ADDR CPPFLAGS += -DMINIUPNPC_GET_SRC_ADDR
CFLAGS += -D_BSD_SOURCE CPPFLAGS += -D_BSD_SOURCE
CFLAGS += -D_DEFAULT_SOURCE CPPFLAGS += -D_DEFAULT_SOURCE
ifneq (, $(findstring netbsd, $(OS))) ifneq (, $(findstring netbsd, $(OS)))
CFLAGS += -D_NETBSD_SOURCE CPPFLAGS += -D_NETBSD_SOURCE
endif endif
ifeq (, $(findstring freebsd, $(OS))$(findstring darwin, $(OS))) ifeq (, $(findstring freebsd, $(OS))$(findstring darwin, $(OS)))
#CFLAGS += -D_POSIX_C_SOURCE=200112L #CPPFLAGS += -D_POSIX_C_SOURCE=200112L
CFLAGS += -D_XOPEN_SOURCE=600 CPPFLAGS += -D_XOPEN_SOURCE=600
endif endif
#CFLAGS += -ansi #CFLAGS += -ansi
#CFLAGS += -DNO_GETADDRINFO #CPPFLAGS += -DNO_GETADDRINFO
INSTALL = install INSTALL = install
SH = /bin/sh SH = /bin/sh
JAVA = java JAVA = java
@ -64,7 +64,7 @@ JNAERATORBASEURL = https://repo1.maven.org/maven2/com/nativelibs4java/jnaerator/
ifneq (, $(findstring sun, $(OS))$(findstring solaris, $(OS))) ifneq (, $(findstring sun, $(OS))$(findstring solaris, $(OS)))
LDLIBS=-lsocket -lnsl -lresolv LDLIBS=-lsocket -lnsl -lresolv
CFLAGS += -D__EXTENSIONS__ CPPFLAGS += -D__EXTENSIONS__
CFLAGS += -std=c99 CFLAGS += -std=c99
endif endif
@ -106,7 +106,7 @@ LIBRARY = libminiupnpc.a
ifneq (, $(findstring darwin, $(OS))) ifneq (, $(findstring darwin, $(OS)))
SHAREDLIBRARY = libminiupnpc.dylib SHAREDLIBRARY = libminiupnpc.dylib
SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
CFLAGS := -D_DARWIN_C_SOURCE $(CFLAGS) CPPFLAGS += -D_DARWIN_C_SOURCE
else else
ifeq ($(JARSUFFIX), win32) ifeq ($(JARSUFFIX), win32)
SHAREDLIBRARY = miniupnpc.dll SHAREDLIBRARY = miniupnpc.dll
@ -292,7 +292,7 @@ miniupnpc.pc: VERSION
echo "Cflags: -I\$${includedir}" >> $@ echo "Cflags: -I\$${includedir}" >> $@
depend: depend:
makedepend -Y -- $(CFLAGS) -- $(SRCS) 2>/dev/null makedepend -Y -- $(CFLAGS) $(CPPFLAGS) -- $(SRCS) 2>/dev/null
$(LIBRARY): $(LIBOBJS) $(LIBRARY): $(LIBOBJS)
ifneq (, $(findstring darwin, $(OS))) ifneq (, $(findstring darwin, $(OS)))