From 0cc0db9f7d40fdf9e88f20101a5183e35ba2ea91 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Tue, 18 Jul 2017 01:38:01 +0200
Subject: [PATCH] Don't duplicate CFLAGS and CPPFLAGS.
Don't put the CPPFLAGS and CFLAGS duplicate to the compiler which lead
to warnings about redefinition of constants on command line like
<command-line>:0:0: warning: "EXTENSIONDIR" redefined
<command-line>:0:0: note: this is the location of the previous
definition
---
Makefile | 11 ++++++-----
config.mk | 11 +++++------
src/Makefile | 4 ++--
src/webextension/Makefile | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index dd9aa53..2b84a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,12 @@ all: $(SRCDIR).subdir-all
options:
@echo "vimb build options:"
- @echo "LIBS = $(LIBS)"
- @echo "CFLAGS = $(CFLAGS)"
- @echo "LDFLAGS = $(LDFLAGS)"
- @echo "EXTCFLAGS = $(EXTCFLAGS)"
- @echo "CC = $(CC)"
+ @echo "LIBS = $(LIBS)"
+ @echo "CFLAGS = $(VIMB_CFLAGS)"
+ @echo "LDFLAGS = $(VIIMB_LDFLAGS)"
+ @echo "EXT_CFLAGS = $(EXT_CFLAGS)"
+ @echo "EXT_LDFLAGS = $(EXT_LDFLAGS)"
+ @echo "CC = $(CC)"
install: $(SRCDIR).subdir-all
@# binary
diff --git a/config.mk b/config.mk
index ecc19fa..1a26527 100644
--- a/config.mk
+++ b/config.mk
@@ -24,6 +24,7 @@ COMMIT := $(shell git describe --tags --always 2> /dev/null || echo "unknown")
# setup general used CFLAGS
CFLAGS += -std=c99 -pipe -Wall
+
#CPPFLAGS += -pedantic
CPPFLAGS += -DVERSION=\"${VERSION}\" -DEXTENSIONDIR=\"${EXTENSIONDIR}\" -DCOMMIT=\"$(COMMIT)\"
CPPFLAGS += -DPROJECT=\"vimb\" -DPROJECT_UCFIRST=\"Vimb\"
@@ -35,11 +36,9 @@ CPPFLAGS += -DGDK_DISABLE_DEPRECATED
# flags used to build webextension
EXTTARGET = webext_main.so
-EXTCFLAGS = ${CFLAGS} -fPIC $(shell pkg-config --cflags webkit2gtk-4.0)
-EXTCFLAGS += $(CPPFLAGS)
-EXTLDFLAGS = $(shell pkg-config --libs webkit2gtk-4.0) -shared
+EXT_CFLAGS = -fPIC $(shell pkg-config --cflags webkit2gtk-4.0) $(CPPFLAGS) $(CFLAGS)
+EXT_LDFLAGS = $(shell pkg-config --libs webkit2gtk-4.0) -shared $(LDFLAGS)
# flags used for the main application
-CFLAGS += $(shell pkg-config --cflags $(LIBS))
-CFLAGS += ${CPPFLAGS}
-LDFLAGS += $(shell pkg-config --libs $(LIBS))
+VIMB_CFLAGS = $(shell pkg-config --cflags $(LIBS)) $(CPPFLAGS) $(CFLAGS)
+VIMB_LDFLAGS = $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
diff --git a/src/Makefile b/src/Makefile
index aa87200..0d2842a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,7 @@ clean: $(SUBDIRS:%=%.subdir-clean)
vimb: $(OBJ)
@echo "${CC} $@"
- $(Q)$(CC) $(OBJ) $(LDFLAGS) -o $@
+ $(Q)$(CC) $(OBJ) $(VIMB_LDFLAGS) -o $@
$(OBJ): config.h $(BASEDIR)/config.mk
@@ -36,7 +36,7 @@ scripts/scripts.h: $(JSFILES) $(CSSFILES)
%.o: %.c
@echo "${CC} $@"
- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
+ $(Q)$(CC) $(VIMB_CFLAGS) -c -o $@ $<
%.subdir-all: config.h
$(Q)$(MAKE) -C $*
diff --git a/src/webextension/Makefile b/src/webextension/Makefile
index 215629c..ff34ff2 100644
--- a/src/webextension/Makefile
+++ b/src/webextension/Makefile
@@ -10,10 +10,10 @@ clean:
$(EXTTARGET): $(OBJ)
@echo "$(CC) $@"
- $(Q)$(CC) $(OBJ) $(EXTLDFLAGS) -o $@
+ $(Q)$(CC) $(OBJ) $(EXT_LDFLAGS) -o $@
%.lo: %.c
@echo "${CC} $@"
- $(Q)$(CC) $(EXTCFLAGS) -fPIC -c -o $@ $<
+ $(Q)$(CC) $(EXT_CFLAGS) -fPIC -c -o $@ $<
.PHONY: all clean
--
2.20.1