From 8b7fa2faba3653a5501f4754bec12dfc022e852c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Fri, 17 Feb 2023 23:54:15 +0100 Subject: [PATCH 1/2] try to respect outside CXXFLAGS --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9d70e795..b08fd10e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -CXX= g++ -CC= gcc -CXXFLAGS= -g -O3 -msse4.2 -mpopcnt -fomit-frame-pointer -Wall -CFLAGS= $(CXXFLAGS) -CPPFLAGS= -INCLUDES= -OBJS= CommandLines.o Process_Read.o Assembly.o Hash_Table.o \ +CXX := g++ +CC := gcc +CXXFLAGS := $(CXXFLAGS) -g -O3 -msse4.2 -mpopcnt -fomit-frame-pointer -Wall +CFLAGS := $(CXXFLAGS) +CPPFLAGS := +INCLUDES := +OBJS := CommandLines.o Process_Read.o Assembly.o Hash_Table.o \ POA.o Correct.o Levenshtein_distance.o Overlaps.o Trio.o kthread.o Purge_Dups.o \ htab.o hist.o sketch.o anchor.o extract.o sys.o ksw2_extz2_sse.o hic.o rcut.o horder.o \ tovlp.o inter.o kalloc.o gfa_ut.o gchain_map.o @@ -79,4 +79,4 @@ tovlp.o: tovlp.h inter.o: inter.h Process_Read.h kalloc.o: kalloc.h gfa_ut.o: Overlaps.h -gchain_map.o: gchain_map.h \ No newline at end of file +gchain_map.o: gchain_map.h From 5b8097b4a74ddbc553da79519a1dbb652af1cf56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Thu, 23 Feb 2023 09:35:22 +0100 Subject: [PATCH 2/2] Use ?= --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b08fd10e..a51ea30b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -CXX := g++ -CC := gcc -CXXFLAGS := $(CXXFLAGS) -g -O3 -msse4.2 -mpopcnt -fomit-frame-pointer -Wall -CFLAGS := $(CXXFLAGS) -CPPFLAGS := -INCLUDES := -OBJS := CommandLines.o Process_Read.o Assembly.o Hash_Table.o \ +CXX ?= g++ +CC ?= gcc +CXXFLAGS ?= $(CXXFLAGS) -g -O3 -msse4.2 -mpopcnt -fomit-frame-pointer -Wall +CFLAGS ?= $(CXXFLAGS) +CPPFLAGS= +INCLUDES= +OBJS= CommandLines.o Process_Read.o Assembly.o Hash_Table.o \ POA.o Correct.o Levenshtein_distance.o Overlaps.o Trio.o kthread.o Purge_Dups.o \ htab.o hist.o sketch.o anchor.o extract.o sys.o ksw2_extz2_sse.o hic.o rcut.o horder.o \ tovlp.o inter.o kalloc.o gfa_ut.o gchain_map.o