From: Daniel Carl <danielcarl@gmx.de>
Date: Fri, 13 Apr 2018 19:43:12 +0000 (+0200)
Subject: Give CPP and CFLAGS separate to compiler.
X-Git-Url: https://git.owens.tech/rss.xml/rss.xml/git?a=commitdiff_plain;h=018e4051b1f8708a02e0d4d204870895f7dd4597;p=vimb.git

Give CPP and CFLAGS separate to compiler.

Revert "Don't duplicate CFLAGS and CPPFLAGS."
This reverts commit 0cc0db9f7d40fdf9e88f20101a5183e35ba2ea91.
---

diff --git a/Makefile b/Makefile
index 2b84a6a..dd9aa53 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,11 @@ all: $(SRCDIR).subdir-all
 
 options:
 	@echo "vimb build options:"
-	@echo "LIBS        = $(LIBS)"
-	@echo "CFLAGS      = $(VIMB_CFLAGS)"
-	@echo "LDFLAGS     = $(VIIMB_LDFLAGS)"
-	@echo "EXT_CFLAGS  = $(EXT_CFLAGS)"
-	@echo "EXT_LDFLAGS = $(EXT_LDFLAGS)"
-	@echo "CC          = $(CC)"
+	@echo "LIBS      = $(LIBS)"
+	@echo "CFLAGS    = $(CFLAGS)"
+	@echo "LDFLAGS   = $(LDFLAGS)"
+	@echo "EXTCFLAGS = $(EXTCFLAGS)"
+	@echo "CC        = $(CC)"
 
 install: $(SRCDIR).subdir-all
 	@# binary
diff --git a/config.mk b/config.mk
index 876bc85..098e49f 100644
--- a/config.mk
+++ b/config.mk
@@ -24,7 +24,6 @@ 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\"
@@ -36,9 +35,10 @@ CPPFLAGS += -DGDK_DISABLE_DEPRECATED
 
 # flags used to build webextension
 EXTTARGET   = webext_main.so
-EXT_CFLAGS  = -fPIC $(shell pkg-config --cflags webkit2gtk-4.0) $(CPPFLAGS) $(CFLAGS)
-EXT_LDFLAGS = $(shell pkg-config --libs webkit2gtk-4.0) -shared $(LDFLAGS)
+EXTCFLAGS   = ${CFLAGS} -fPIC $(shell pkg-config --cflags webkit2gtk-4.0)
+EXTCPPFLAGS = $(CPPFLAGS)
+EXTLDFLAGS  = $(shell pkg-config --libs webkit2gtk-4.0) -shared
 
 # flags used for the main application
-VIMB_CFLAGS  = $(shell pkg-config --cflags $(LIBS)) $(CPPFLAGS) $(CFLAGS) 
-VIMB_LDFLAGS = $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
+CFLAGS     += $(shell pkg-config --cflags $(LIBS))
+LDFLAGS    += $(shell pkg-config --libs $(LIBS))
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