aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-12-06 06:42:54 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-01-17 10:33:57 -0300
commit5b1ce32bbced20b01be2dcea4ecca510a7194b75 (patch)
treeb914170c00fec607ab43f09d3eaf0fc5bd0a6296 /src
parentbuild(deps): bump github/codeql-action from 3.22.12 to 3.23.0 (diff)
downloadfirejail-5b1ce32bbced20b01be2dcea4ecca510a7194b75.tar.gz
firejail-5b1ce32bbced20b01be2dcea4ecca510a7194b75.tar.zst
firejail-5b1ce32bbced20b01be2dcea4ecca510a7194b75.zip
build: use CPPFLAGS instead of INCLUDE in compile targets
With this, CFLAGS and CPPFLAGS are used when compiling and LDFLAGS when linking, just like in the built-in GNU make rules. From `make -p`: COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) LINK.o = $(CC) $(LDFLAGS) $(TARGET_ARCH) Note: It is unclear where the `INCLUDE` variable comes from; it is not documented in autoconf nor GNU make and automake (which itself is not used in this repository) only mentions `INCLUDES`: `INCLUDES` This does the same job as `AM_CPPFLAGS` (or any per-target `_CPPFLAGS` variable if it is used). It is an older name for the same functionality. This variable is deprecated; we suggest using `AM_CPPFLAGS` and per-target `_CPPFLAGS` instead. Environment: automake 1.16.5-2 and GNU make 4.4.1 on Artix Linux. See also commit 671c3f249 ("build: actually set LDFLAGS and LIBS in makefiles", 2022-11-30) / PR #5504.
Diffstat (limited to 'src')
-rw-r--r--src/prog.mk2
-rw-r--r--src/so.mk2
2 files changed, 2 insertions, 2 deletions
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)
13all: $(TARGET) 13all: $(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)
diff --git a/src/so.mk b/src/so.mk
index c1913b794..27c5695a8 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -13,7 +13,7 @@ OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
13all: $(TARGET) 13all: $(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