diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-01-20 20:41:44 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-20 20:41:44 +0000 |
| commit | c85aa8567cfbd644da8e868c0ca298cc828f48e8 (patch) | |
| tree | 5fe3ed52fc7f9b836ffdddd2a175027359cec891 /src | |
| parent | Merge pull request #6153 from kmk3/firecfg-ignorelist-extra (diff) | |
| parent | build: use CPPFLAGS instead of INCLUDE in compile targets (diff) | |
| download | firejail-c85aa8567cfbd644da8e868c0ca298cc828f48e8.tar.gz firejail-c85aa8567cfbd644da8e868c0ca298cc828f48e8.tar.zst firejail-c85aa8567cfbd644da8e868c0ca298cc828f48e8.zip | |
Merge pull request #6159 from kmk3/build-use-cppflags
build: use CPPFLAGS instead of INCLUDE in compile targets
Diffstat (limited to 'src')
| -rw-r--r-- | src/prog.mk | 2 | ||||
| -rw-r--r-- | src/so.mk | 2 |
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) | |||
| 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 |