Lines 1-55
Link Here
|
1 |
--- Makefile.orig 2018-03-06 16:29:49 UTC |
1 |
--- Makefile.orig 2020-01-26 03:31:12 UTC |
2 |
+++ Makefile |
2 |
+++ Makefile |
3 |
@@ -6,12 +6,12 @@ GDIR :=./gclib |
3 |
@@ -20,7 +20,7 @@ ifeq "$(GCCVER8)" "1" |
4 |
|
4 |
BASEFLAGS += -Wno-class-memaccess |
5 |
INCDIRS := -I. -I${GDIR} -I${BAM} |
|
|
6 |
|
7 |
-CC := g++ |
8 |
+CXX ?= g++ |
9 |
|
10 |
BASEFLAGS := -Wall -Wextra ${INCDIRS} -fsigned-char -D_FILE_OFFSET_BITS=64 \ |
11 |
-D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-exceptions -fno-rtti |
12 |
|
13 |
-LINKER := g++ |
14 |
+LINKER = ${CXX} |
15 |
|
16 |
LDFLAGS := -g -L${BAM} $(LDFLAGS) |
17 |
|
18 |
@@ -22,13 +22,13 @@ ifneq (,$(findstring nothreads,$(MAKECMD |
19 |
endif |
5 |
endif |
20 |
|
6 |
|
21 |
#detect MinGW (Windows environment) |
7 |
-LINKER := $(if $(LINKER),$(LINKER),g++) |
22 |
-ifneq (,$(findstring mingw,$(shell ${CC} -dumpmachine))) |
8 |
+LINKER := $(if $(LINKER),$(LINKER),$(CXX)) |
23 |
+ifneq (,$(findstring mingw,$(shell ${CXX} -dumpmachine))) |
|
|
24 |
WINDOWS=1 |
25 |
endif |
26 |
|
9 |
|
27 |
# MinGW32 GCC 4.5 link problem fix |
10 |
LDFLAGS := $(if $(LDFLAGS),$(LDFLAGS),-g) |
28 |
#ifdef WINDOWS |
|
|
29 |
-ifneq (,$(findstring 4.5.,$(shell g++ -dumpversion))) |
30 |
+ifneq (,$(findstring 4.5.,$(shell ${CXX} -dumpversion))) |
31 |
STATIC_CLIB=1 |
32 |
endif |
33 |
#endif |
34 |
@@ -63,7 +63,7 @@ endif |
35 |
ifneq (,$(filter %release %static, $(MAKECMDGOALS))) |
36 |
# -- release build |
37 |
RELEASE_BUILD=1 |
38 |
- CFLAGS := -DNDEBUG -g $(BASEFLAGS) $(CFLAGS) -O3 |
39 |
+ CFLAGS := -DNDEBUG -g $(BASEFLAGS) $(CFLAGS) |
40 |
else |
41 |
ifneq (,$(filter %memcheck %memdebug, $(MAKECMDGOALS))) |
42 |
#use sanitizer in gcc 4.9+ |
43 |
@@ -122,7 +122,7 @@ endif |
44 |
|
11 |
|
45 |
|
12 |
@@ -151,7 +151,7 @@ rlink.o : rlink.h tablemaker.h $(GDIR)/G |
46 |
%.o : %.cpp |
|
|
47 |
- ${CC} ${CFLAGS} -c $< -o $@ |
48 |
+ ${CXX} ${CFLAGS} -c $< -o $@ |
49 |
|
50 |
OBJS += rlink.o tablemaker.o tmerge.o |
51 |
|
52 |
@@ -137,7 +137,7 @@ rlink.o : rlink.h tablemaker.h $(GDIR)/G |
53 |
tmerge.o : rlink.h tmerge.h |
13 |
tmerge.o : rlink.h tmerge.h |
54 |
tablemaker.o : tablemaker.h rlink.h |
14 |
tablemaker.o : tablemaker.h rlink.h |
55 |
${BAM}/libbam.a: |
15 |
${BAM}/libbam.a: |
Lines 58-64
Link Here
|
58 |
stringtie: ${BAM}/libbam.a $(OBJS) stringtie.o |
18 |
stringtie: ${BAM}/libbam.a $(OBJS) stringtie.o |
59 |
${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LIBS} |
19 |
${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LIBS} |
60 |
@echo |
20 |
@echo |
61 |
@@ -151,6 +151,6 @@ clean: |
21 |
@@ -167,6 +167,6 @@ clean: |
62 |
${RM} stringtie${EXE} stringtie.o* $(OBJS) |
22 |
${RM} stringtie${EXE} stringtie.o* $(OBJS) |
63 |
${RM} core.* |
23 |
${RM} core.* |
64 |
allclean cleanAll cleanall: |
24 |
allclean cleanAll cleanall: |