aboutsummaryrefslogtreecommitdiff
blob: b5797618fd8e12f4476d46df9eeed9ba514a48fb (plain)
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
 mdust/Makefile    |   18 +++++++++---------
 mdust/fastafile.c |    3 ++-
 mdust/mdust.c     |    1 +
 trimpoly/Makefile |   16 ++++++++--------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/mdust/Makefile b/mdust/Makefile
index 81bf4e9..0c75e69 100644
--- a/mdust/Makefile
+++ b/mdust/Makefile
@@ -1,40 +1,40 @@
 # Useful directories
 
 # Directories to search for header files
-SEARCHDIRS := -I. -I- 
+SEARCHDIRS := -I. -iquote
 
 
 #SYSTYPE :=     $(shell uname)
 
-CC      := gcc
-CFLAGS  = -O2 -Wall ${SEARCHDIRS} -D_REENTRANT
+CC      ?= gcc
+CFLAGS  += ${SEARCHDIRS} -D_REENTRANT
+CXXFLAGS  += ${SEARCHDIRS} -D_REENTRANT
 
 %.o : %.c
 	${CC} ${CFLAGS} -c $< -o $@
 
 %.o : %.cc
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.C
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cpp
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cxx
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 # C/C++ linker
 
 LINKER    := gcc
-LDFLAGS    =
 LOADLIBES := 
 
 .PHONY : all
 all:    mdust
 
 mdust:  ./mdust.o ./dust.o ./fastafile.o
-	${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
+	${CXX} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
 
 # target for removing all object files
 
diff --git a/mdust/fastafile.c b/mdust/fastafile.c
index 6c14b99..5f70f14 100644
--- a/mdust/fastafile.c
+++ b/mdust/fastafile.c
@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <malloc.h>
-
+#include <string.h>
+#include <stdlib.h>
 #include "fastafile.h"
 
 
diff --git a/mdust/mdust.c b/mdust/mdust.c
index f2bae99..c3ee686 100644
--- a/mdust/mdust.c
+++ b/mdust/mdust.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "dust.h"
 #include "fastafile.h"
 
diff --git a/trimpoly/Makefile b/trimpoly/Makefile
index 84db22d..71145c2 100644
--- a/trimpoly/Makefile
+++ b/trimpoly/Makefile
@@ -3,28 +3,28 @@
 # Directories to search for header files
 SEARCHDIRS := -I.
 
-CC      := gcc
-CFLAGS  = -O2 -Wall ${SEARCHDIRS} -D_REENTRANT
+CC      ?= gcc
+CFLAGS  += ${SEARCHDIRS} -D_REENTRANT
+CXXFLAGS  += ${SEARCHDIRS} -D_REENTRANT
 
 %.o : %.c
 	${CC} ${CFLAGS} -c $< -o $@
 
 %.o : %.cc
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.C
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cpp
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 %.o : %.cxx
-	${CC} ${CFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS} -c $< -o $@
 
 # C/C++ linker
 
 LINKER    := gcc
-LDFLAGS    = 
 LOADLIBES =
 SYSTYPE :=     $(shell uname)
 #ifeq ($(SYSTYPE), Linux)
@@ -37,7 +37,7 @@ SYSTYPE :=     $(shell uname)
 all:    trimpoly
 
 trimpoly:  ./trimpoly.o color_c.o
-	${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
+	${CXX} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
 
 # target for removing all object files