diff options
| author | Daniel Carl <danielcarl@gmx.de> | 2018-04-13 21:43:12 +0200 |
|---|---|---|
| committer | Daniel Carl <danielcarl@gmx.de> | 2018-04-13 22:02:38 +0200 |
| commit | 018e4051b1f8708a02e0d4d204870895f7dd4597 (patch) | |
| tree | af64ecad0348c8d19bd518835c1ff669641dacec /src | |
| parent | e71bcdb3a898f8e984131d79e331277ebff41c42 (diff) | |
Give CPP and CFLAGS separate to compiler.
Revert "Don't duplicate CFLAGS and CPPFLAGS."
This reverts commit 0cc0db9f7d40fdf9e88f20101a5183e35ba2ea91.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/webextension/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 0d2842a..683b9b1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,7 @@ clean: $(SUBDIRS:%=%.subdir-clean) vimb: $(OBJ) @echo "${CC} $@" - $(Q)$(CC) $(OBJ) $(VIMB_LDFLAGS) -o $@ + $(Q)$(CC) $(OBJ) $(LDFLAGS) -o $@ $(OBJ): config.h $(BASEDIR)/config.mk @@ -36,7 +36,7 @@ scripts/scripts.h: $(JSFILES) $(CSSFILES) %.o: %.c @echo "${CC} $@" - $(Q)$(CC) $(VIMB_CFLAGS) -c -o $@ $< + $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< %.subdir-all: config.h $(Q)$(MAKE) -C $* diff --git a/src/webextension/Makefile b/src/webextension/Makefile index ff34ff2..72c12df 100644 --- a/src/webextension/Makefile +++ b/src/webextension/Makefile @@ -10,10 +10,10 @@ clean: $(EXTTARGET): $(OBJ) @echo "$(CC) $@" - $(Q)$(CC) $(OBJ) $(EXT_LDFLAGS) -o $@ + $(Q)$(CC) $(OBJ) $(EXTLDFLAGS) -o $@ %.lo: %.c @echo "${CC} $@" - $(Q)$(CC) $(EXT_CFLAGS) -fPIC -c -o $@ $< + $(Q)$(CC) $(EXTCPPFLAGS) $(EXTCFLAGS) -fPIC -c -o $@ $< .PHONY: all clean |