aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYour Name <you@example.com>2022-02-23 14:46:21 -0500
committerYour Name <you@example.com>2022-02-23 14:46:21 -0500
commit11f6903b4bac951d527e57e0077f719b602c7a6e (patch)
treee3eb135850454776288188b8225156bc314c01bf
parentf0ffaa2e3db4498b4cb737e570d0db80c05fba50 (diff)
downloadlibbible-11f6903b4bac951d527e57e0077f719b602c7a6e.tar.gz
libbible-11f6903b4bac951d527e57e0077f719b602c7a6e.tar.bz2
libbible-11f6903b4bac951d527e57e0077f719b602c7a6e.zip
Fixed issue with override and export on same variable
-rw-r--r--Makefile1
-rw-r--r--src/lib/Makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bc42913..1b88242 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
export version = 1.0.2
override CXXFLAGS += -MMD -Wall -std=c++20
-export CXXFLAGS
override LDFLAGS += -Lsrc/lib -lbible
SOURCES = $(wildcard src/*.cc)
OBJECTS = $(SOURCES:.cc=.o)
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 8084d3f..4f0d2cf 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,5 +1,5 @@
LIBS = sword minizip
-override CXXFLAGS += -fPIC `pkg-config $(LIBS) --cflags`
+override CXXFLAGS += -MMD -Wall -std=c++20 -fPIC `pkg-config $(LIBS) --cflags`
override LDFLAGS += -lstdc++fs `pkg-config $(LIBS) --libs`
SOURCES = $(wildcard *.cc)
OBJECTS = $(SOURCES:.cc=.o)