1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
|
From: Bastian Germann <bage@debian.org>
Forwarded: not-needed
Date: Fri, 8 Nov 2024 21:21:59 +0000
Subject: Drop hard-coded compiler flags
---
diff --git a/src/Makefile.in b/src/Makefile.in
index 0a93e97..5bae41c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -28,8 +28,6 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
COMPILER = g++
-CFLAGS += --debug -O0
-CXXFLAGS += -std=c++17 -stdlib=libc++ --debug -O0
ARFLAGS = rcs
@@ -82,7 +82,7 @@ HEADERS = \
ur-encoder.hpp \
ur-decoder.hpp
-libdir = $(DESTDIR)$(prefix)/lib
+libdir = $(DESTDIR)@libdir@
includedir = $(DESTDIR)$(prefix)/include/$(package)
.PHONY: install
diff --git a/test/Makefile.in b/test/Makefile.in
index 8c52594..719ebb2 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -28,13 +28,11 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
COMPILER = g++
-CFLAGS += --debug -O0
-CXXFLAGS += -std=c++17 -stdlib=libc++ --debug -O0
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
- LDLIBS += -lm -lc++ -lc++abi -lgcc_s -lgcc
+ LDLIBS += -lm -lstdc++ -lgcc_s -lgcc
else ifeq ($(findstring MINGW64, $(UNAME)), MINGW64)
# on windows building with msys2/mingw64
LDLIBS += -lm -lc++ -lws2_32
|