summaryrefslogtreecommitdiff
blob: 17ca27e6da5a690cf8cd43d40174e6f5754abc01 (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
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
--- a/squid/Makefile
+++ b/squid/Makefile
@@ -19,7 +19,6 @@
 #  On an Alliant, use fxc.
 #
 #CC = cc
-CC = gcc
 #CC = fxc
 
 ## Any special compiler flags you want.
@@ -37,7 +36,6 @@
 #  for instance. If the code builds cleanly but seg faults, try
 #  rebuilding without optimization.
 #
-CFLAGS = -O
 #CFLAGS = -g 
 #CFLAGS = -TARG:exc_max -64 -Ofast=ip27    #specific SGI Origin200 compiler#
 
@@ -47,8 +45,6 @@
 #  Don't worry. The Makefile tests for ranlib existence and will work
 #  fine on SGIs even if RANLIB is set.
 #
-AR     = ar rcv
-RANLIB = ranlib
 
 ## Machine specific definitions
 #
@@ -108,41 +104,41 @@
 all: $(LIBTARGET)  
 
 alistat: $(OBJ) alistat_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o alistat $(OBJ) alistat_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o alistat $(OBJ) alistat_main.o $(LIBS)
 
 compalign: $(OBJ) compalign_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o compalign $(OBJ) compalign_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o compalign $(OBJ) compalign_main.o $(LIBS)
 
 compstruct: $(OBJ) compstruct_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o compstruct $(OBJ) compstruct_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o compstruct $(OBJ) compstruct_main.o $(LIBS)
 
 getseq: $(OBJ) getseq_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o getseq $(OBJ) getseq_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o getseq $(OBJ) getseq_main.o $(LIBS)
 
 reformat: $(OBJ) reformat_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o reformat $(OBJ) reformat_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o reformat $(OBJ) reformat_main.o $(LIBS)
 
 revcomp: $(OBJ) revcomp_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o revcomp $(OBJ) revcomp_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o revcomp $(OBJ) revcomp_main.o $(LIBS)
 
 seqstat: $(OBJ) seqstat_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o seqstat $(OBJ) seqstat_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o seqstat $(OBJ) seqstat_main.o $(LIBS)
 
 seqsplit: $(OBJ) seqsplit_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o seqstat $(OBJ) seqsplit_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o seqstat $(OBJ) seqsplit_main.o $(LIBS)
 
 shuffle: $(OBJ) shuffle_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o shuffle $(OBJ) shuffle_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o shuffle $(OBJ) shuffle_main.o $(LIBS)
 
 translate:  $(OBJ) translate_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o translate $(OBJ) translate_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o translate $(OBJ) translate_main.o $(LIBS)
 
 weight: $(OBJ) weight_main.o
-	$(CC) $(CFLAGS) $(MDEFS) -o weight $(OBJ) weight_main.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) -o weight $(OBJ) weight_main.o $(LIBS)
 
 
 $(LIBTARGET): $(OBJ)
-	$(AR) $(LIBTARGET) $(OBJ)
+	$(AR) rcv $(LIBTARGET) $(OBJ)
 	-if test -x /bin/ranlib; then /bin/ranlib $(LIBTARGET); else exit 0; fi
 	-if test -x /usr/bin/ranlib; then /usr/bin/ranlib $(LIBTARGET); else exit 0; fi
 	-if test -x $(RANLIB); then $(RANLIB) $(LIBTARGET); else exit 0; fi
@@ -182,4 +178,4 @@
 	etags -t $(SRC) $(HDRS)
 
 .c.o:
-	$(CC) $(CFLAGS) $(MDEFS) -c $<		
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -c $<
--- a/squid02/Makefile
+++ b/squid02/Makefile
@@ -27,8 +27,6 @@
 
 ## your compiler and compiler flags
 #
-CC     = gcc
-CFLAGS = -g -O2
 
 ## other defined flags for machine-specific stuff 
 #
@@ -37,8 +35,6 @@
 
 ## Archiver command
 #
-AR     = ar rcv
-RANLIB = ranlib
 
 ## instructions for installing man pages
 #
@@ -158,10 +154,10 @@
 all: version.h $(PROGS) libsquid.a
 
 $(PROGS): %: %_main.o version.h $(OBJS) 
-	$(CC) $(CFLAGS) $(MDEFS) $(PVMLIBDIR) -o $@ $@_main.o $(OBJS) $(PVMLIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(MDEFS) $(PVMLIBDIR) -o $@ $@_main.o $(OBJS) $(PVMLIBS) $(LIBS)
 
 .c.o:
-	$(CC) $(CFLAGS) $(PVMFLAG) $(PVMINCDIR) $(MDEFS) -c $<		
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(PVMFLAG) $(PVMINCDIR) $(MDEFS) -c $<
 ################################################################
 
 
@@ -172,7 +168,7 @@
 module: libsquid.a
 
 libsquid.a: version.h $(OBJS)
-	$(AR) libsquid.a $(OBJS)
+	$(AR) rcv libsquid.a $(OBJS)
 	$(RANLIB) libsquid.a
 	chmod 644 libsquid.a
 #################################################################
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,7 +21,6 @@
 SQUIDSRCDIR02 = ../squid02
 
 ## your compiler
-CC = gcc
 #CC = cc
 
 ## any special compiler flags you want
@@ -30,7 +29,6 @@
 #CFLAGS = -g -Wall -pedantic 
 #CFLAGS = -TARG:exc_max 
 #CFLAGS = -g -fullwarn -wlint,-fviah
-CFLAGS = -O
 #CFLAGS = -p # profiling #
 #CFLAGS = -64 -Ofast=ip27   #specific warhorse compiler#
 
@@ -131,145 +129,145 @@
 all: 	$(PROGS)
 
 main:              $(OBJ) main.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR) $@.o  $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(LIBS)
 cfgbuild:          $(OBJ) cfgbuild.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
 eqrna:             $(OBJ) eqrna.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
 eqrna_sample:      $(OBJ) eqrna_sample.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
 shuffle:           $(OBJ) shuffle.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR) $@.o $(OBJ) $(LIBS)
 rnamat_main:       $(OBJ2) rnamat_main.o
-	           $(CC) $(CFLAGS) -o $@ -L$(SQUIDDIR02) $@.o $(OBJ2) $(LIBS)
+	           $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -L$(SQUIDDIR02) $@.o $(OBJ2) $(LIBS)
 
 main.o:            ../src/main.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 cfgbuild.o:        ../src/cfgbuild.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 eqrna.o:           ../src/eqrna.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 eqrna_sample.o:    ../src/eqrna_sample.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 shuffle.o:         ../src/shuffle.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnamat_main.o:     ../src/rnamat_main.c
-	           $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?	
+	           $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?
 
 cfgio.o:                      ../src/cfgio.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 cfgmodel.o:                   ../src/cfgmodel.c
-		              $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+		                  $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 cfgparse.o:                   ../src/cfgparse.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 codcreatealign.o:             ../src/codcreatealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 coddp.o:                      ../src/coddp.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 coddpscanfast.o:              ../src/coddpscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 codmodel.o:                   ../src/codmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 codon.o:                      ../src/codon.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 codscorealign.o:              ../src/codscorealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 er_math.o:                    ../src/er_math.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 er_vectop.o:                  ../src/er_vectop.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?
 evd.o:                        ../src/evd.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolcodmodel.o:               ../src/evolcodmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolemissions.o:              ../src/evolemissions.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolmisc.o:                   ../src/evolmisc.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolnullmodel.o:              ../src/evolnullmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolothmodel.o:               ../src/evolothmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolqrnaversion.o:            ../src/evolqrnaversion.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolscorewithmodels.o:        ../src/evolscorewithmodels.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolscorewithmodelscanfast.o: ../src/evolscorewithmodelscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolriboprob.o:               ../src/evolriboprob.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolrnadp.o:                  ../src/evolrnadp.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolrnadpscanfast.o:          ../src/evolrnadpscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolrnamodel.o:               ../src/evolrnamodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolrnascorealign.o:          ../src/evolrnascorealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 evolve.o:                     ../src/evolve.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 globals.o:                    ../src/globals.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 hexamer.o:                    ../src/hexamer.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 matrix.o:                     ../src/matrix.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 misc.o:                       ../src/misc.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 nrnscfg.o:                    ../src/nrnscfg.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 nstack.o:                     ../src/nstack.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?
 nullmodel.o:                  ../src/nullmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 othcreatealign.o:             ../src/othcreatealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 othdp.o:                      ../src/othdp.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 othdpscanfast.o:              ../src/othdpscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 othmodel.o:                   ../src/othmodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 othscorealign.o:              ../src/othscorealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 posterior.o:                  ../src/posterior.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 qrnaversion.o:                ../src/qrnaversion.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 riboprob.o:                   ../src/riboprob.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnacreatealign.o:             ../src/rnacreatealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnadp.o:                      ../src/rnadp.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnadpscanfast.o:              ../src/rnadpscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnaio.o:                      ../src/rnaio.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnamat.o:                     ../src/rnamat.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR02) -c $?
 rnamodel.o:                   ../src/rnamodel.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnaoutput.o:                  ../src/rnaoutput.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnascorealign.o:              ../src/rnascorealign.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnascfg.o:                    ../src/rnascfg.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 rnascfgscanfast.o:            ../src/rnascfgscanfast.c
-	                      $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 scorewithmodels.o:           ../src/scorewithmodels.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 scorewithmodelscanfast.o:    ../src/scorewithmodelscanfast.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 seqio.o:                     ../src/seqio.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 trace.o:                     ../src/trace.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 traceSCFG.o:                 ../src/traceSCFG.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 tying.o:                     ../src/tying.c
-	                     $(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?	
+	                      $(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $?
 
 
 install: $(PROGS)
@@ -313,10 +311,10 @@
 	/usr/lib/lint/llib-lm.ln
 
 .c.o:
-	$(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $<		
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $<
 
 .m.o:
-	$(CC) $(CFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(MDEFS) -I$(SQUIDDIR) -c $<