Merge pull request #6159 from kmk3/build-use-cppflags

build: use CPPFLAGS instead of INCLUDE in compile targets
netblue30 · Jan 20, 2024 · c85aa85 · c85aa85
2 parents 39fbb6b + 5b1ce32
commit c85aa85
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/config.mk.in b/config.mk.in
@@ -76,6 +76,7 @@ MANFLAGS = \
 # https://www.gnu.org/software/automake/manual/1.16.5/html_node/User-Variables.html
 CC=@CC@
 CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 
 # Project variables

diff --git a/configure b/configure
@@ -5308,6 +5308,7 @@ cat <<EOF
 Compile options:
    CC: $CC
    CFLAGS: $CFLAGS
+   CPPFLAGS: $CPPFLAGS
    LDFLAGS: $LDFLAGS
    EXTRA_CFLAGS: $EXTRA_CFLAGS
    EXTRA_LDFLAGS: $EXTRA_LDFLAGS

diff --git a/configure.ac b/configure.ac
@@ -276,6 +276,7 @@ cat <<EOF
 Compile options:
    CC: $CC
    CFLAGS: $CFLAGS
+   CPPFLAGS: $CPPFLAGS
    LDFLAGS: $LDFLAGS
    EXTRA_CFLAGS: $EXTRA_CFLAGS
    EXTRA_LDFLAGS: $EXTRA_LDFLAGS

diff --git a/src/prog.mk b/src/prog.mk
@@ -13,7 +13,7 @@ OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 all: $(TARGET)
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
-	$(CC) $(PROG_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@
+	$(CC) $(PROG_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 $(PROG): $(OBJS) $(ROOT)/config.mk
 	$(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

diff --git a/src/so.mk b/src/so.mk
@@ -13,7 +13,7 @@ OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 all: $(TARGET)
 
 %.o : %.c $(HDRS) $(ROOT)/config.mk
-	$(CC) $(SO_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@
+	$(CC) $(SO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 $(SO): $(OBJS) $(ROOT)/config.mk
 	$(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) -ldl