diff options
-rw-r--r-- | config.mk.in | 1 | ||||
-rwxr-xr-x | configure | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/prog.mk | 2 | ||||
-rw-r--r-- | src/so.mk | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/config.mk.in b/config.mk.in index 958efdb34..403d78e37 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -76,6 +76,7 @@ MANFLAGS = \ | |||
76 | # https://www.gnu.org/software/automake/manual/1.16.5/html_node/User-Variables.html | 76 | # https://www.gnu.org/software/automake/manual/1.16.5/html_node/User-Variables.html |
77 | CC=@CC@ | 77 | CC=@CC@ |
78 | CFLAGS=@CFLAGS@ | 78 | CFLAGS=@CFLAGS@ |
79 | CPPFLAGS=@CPPFLAGS@ | ||
79 | LDFLAGS=@LDFLAGS@ | 80 | LDFLAGS=@LDFLAGS@ |
80 | 81 | ||
81 | # Project variables | 82 | # Project variables |
@@ -5308,6 +5308,7 @@ cat <<EOF | |||
5308 | Compile options: | 5308 | Compile options: |
5309 | CC: $CC | 5309 | CC: $CC |
5310 | CFLAGS: $CFLAGS | 5310 | CFLAGS: $CFLAGS |
5311 | CPPFLAGS: $CPPFLAGS | ||
5311 | LDFLAGS: $LDFLAGS | 5312 | LDFLAGS: $LDFLAGS |
5312 | EXTRA_CFLAGS: $EXTRA_CFLAGS | 5313 | EXTRA_CFLAGS: $EXTRA_CFLAGS |
5313 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS | 5314 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS |
diff --git a/configure.ac b/configure.ac index fc99820de..d3b05d839 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -276,6 +276,7 @@ cat <<EOF | |||
276 | Compile options: | 276 | Compile options: |
277 | CC: $CC | 277 | CC: $CC |
278 | CFLAGS: $CFLAGS | 278 | CFLAGS: $CFLAGS |
279 | CPPFLAGS: $CPPFLAGS | ||
279 | LDFLAGS: $LDFLAGS | 280 | LDFLAGS: $LDFLAGS |
280 | EXTRA_CFLAGS: $EXTRA_CFLAGS | 281 | EXTRA_CFLAGS: $EXTRA_CFLAGS |
281 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS | 282 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS |
diff --git a/src/prog.mk b/src/prog.mk index b7ac59785..426961c29 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -13,7 +13,7 @@ OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) | |||
13 | all: $(TARGET) | 13 | all: $(TARGET) |
14 | 14 | ||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
16 | $(CC) $(PROG_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(PROG_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
17 | 17 | ||
18 | $(PROG): $(OBJS) $(ROOT)/config.mk | 18 | $(PROG): $(OBJS) $(ROOT)/config.mk |
19 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | 19 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
@@ -13,7 +13,7 @@ OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) | |||
13 | all: $(TARGET) | 13 | all: $(TARGET) |
14 | 14 | ||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | 15 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
16 | $(CC) $(SO_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(SO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
17 | 17 | ||
18 | $(SO): $(OBJS) $(ROOT)/config.mk | 18 | $(SO): $(OBJS) $(ROOT)/config.mk |
19 | $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) -ldl | 19 | $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) -ldl |