cuberite/libdeflate
1
0
Fork 0
mirror of https://github.com/cuberite/libdeflate.git synced 2025-09-17 00:06:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: support user-specified CPPFLAGS

Browse Source
This commit is contained in:
Eric Biggers 2018-12-23 13:13:28 -06:00
parent dfd839df4e
commit 6e7813e8fa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -29,6 +29,8 @@ override CFLAGS := \
$(call cc-option,-Wstrict-prototypes) \ $(call cc-option,-Wstrict-prototypes) \
$(call cc-option,-Wvla) $(call cc-option,-Wvla)
# We don't define any CPPFLAGS, but support the user specifying it.
############################################################################## ##############################################################################
SOVERSION := 0 SOVERSION := 0
@ -120,11 +122,12 @@ SHARED_LIB_OBJ := $(LIB_SRC:.c=.shlib.o)
# Compile static library object files # Compile static library object files
$(STATIC_LIB_OBJ): %.o: %.c $(LIB_HEADERS) $(COMMON_HEADERS) .lib-cflags $(STATIC_LIB_OBJ): %.o: %.c $(LIB_HEADERS) $(COMMON_HEADERS) .lib-cflags
$(QUIET_CC) $(CC) -o $@ -c $(LIB_CFLAGS) $< $(QUIET_CC) $(CC) -o $@ -c $(CPPFLAGS) $(LIB_CFLAGS) $<
# Compile shared library object files # Compile shared library object files
$(SHARED_LIB_OBJ): %.shlib.o: %.c $(LIB_HEADERS) $(COMMON_HEADERS) .lib-cflags $(SHARED_LIB_OBJ): %.shlib.o: %.c $(LIB_HEADERS) $(COMMON_HEADERS) .lib-cflags
$(QUIET_CC) $(CC) -o $@ -c $(LIB_CFLAGS) $(SHARED_LIB_CFLAGS) -DLIBDEFLATE_DLL $< $(QUIET_CC) $(CC) -o $@ -c $(CPPFLAGS) $(LIB_CFLAGS) \
$(SHARED_LIB_CFLAGS) -DLIBDEFLATE_DLL $<
# Create static library # Create static library
$(STATIC_LIB):$(STATIC_LIB_OBJ) $(STATIC_LIB):$(STATIC_LIB_OBJ)
@ -146,9 +149,9 @@ libdeflate.so:$(SHARED_LIB)
DEFAULT_TARGETS += libdeflate.so DEFAULT_TARGETS += libdeflate.so
endif endif
# Rebuild if CC or LIB_CFLAGS changed # Rebuild if CC, LIB_CFLAGS, or CPPFLAGS changed
.lib-cflags: FORCE .lib-cflags: FORCE
@flags='$(CC):$(LIB_CFLAGS)'; \ @flags='$(CC):$(LIB_CFLAGS):$(CPPFLAGS)'; \
if [ "$$flags" != "`cat $@ 2>/dev/null`" ]; then \ if [ "$$flags" != "`cat $@ 2>/dev/null`" ]; then \
[ -e $@ ] && echo "Rebuilding library due to new compiler flags"; \ [ -e $@ ] && echo "Rebuilding library due to new compiler flags"; \
echo "$$flags" > $@; \ echo "$$flags" > $@; \
@ -186,7 +189,7 @@ programs/config.h:programs/detect.sh .prog-cflags
# Compile program object files # Compile program object files
$(PROG_OBJ): %.o: %.c $(PROG_COMMON_HEADERS) $(COMMON_HEADERS) .prog-cflags $(PROG_OBJ): %.o: %.c $(PROG_COMMON_HEADERS) $(COMMON_HEADERS) .prog-cflags
$(QUIET_CC) $(CC) -o $@ -c $(PROG_CFLAGS) $< $(QUIET_CC) $(CC) -o $@ -c $(CPPFLAGS) $(PROG_CFLAGS) $<
# Link the programs. # Link the programs.
# #
@ -211,9 +214,9 @@ endif
DEFAULT_TARGETS += gunzip$(PROG_SUFFIX) DEFAULT_TARGETS += gunzip$(PROG_SUFFIX)
# Rebuild if CC or PROG_CFLAGS changed # Rebuild if CC, PROG_CFLAGS, or CPPFLAGS changed
.prog-cflags: FORCE .prog-cflags: FORCE
@flags='$(CC):$(PROG_CFLAGS)'; \ @flags='$(CC):$(PROG_CFLAGS):$(CPPFLAGS)'; \
if [ "$$flags" != "`cat $@ 2>/dev/null`" ]; then \ if [ "$$flags" != "`cat $@ 2>/dev/null`" ]; then \
[ -e $@ ] && echo "Rebuilding programs due to new compiler flags"; \ [ -e $@ ] && echo "Rebuilding programs due to new compiler flags"; \
echo "$$flags" > $@; \ echo "$$flags" > $@; \