Skip to content
Browse files

Merge

  • Loading branch information...
2 parents b74f260 + 70c25a0 commit 8170b0071daaa747b92f913aef8e4c11aa1b4907 @dmcc dmcc committed
View
2 evalb/Makefile
@@ -1,4 +1,4 @@
all: evalb
evalb: evalb.c
- gcc -Wall -g -o evalb evalb.c
+ $(CC) -Wall -g -o evalb evalb.c
View
6 evalb/evalb.c
@@ -20,8 +20,12 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
-#include <malloc.h>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
+#include <malloc.h>
+#endif
/* Internal Data format -------------------------------------------*/
/* */
View
14 first-stage/PARSE/Makefile
@@ -8,7 +8,7 @@ clean:
# this rule automatically makes our dependency files.
# run "make Makefile.dep" if you add any files or change dependencies.
Makefile.dep:
- gcc -MM *.C > Makefile.dep
+ $(CC) -MM *.C > Makefile.dep
# include the automatically generated dependency files
-include Makefile.dep
@@ -16,7 +16,7 @@ Makefile.dep:
CFLAGS=-Wall -O3 -fPIC
# CFLAGS=-g
.C.o:
- g++ $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
PARSEANDEVAL_OBJS = \
Bchart.o \
@@ -58,7 +58,7 @@ PARSEANDEVAL_OBJS = \
parseAndEval.o
parseAndEval: $(PARSEANDEVAL_OBJS)
- g++ $(CFLAGS) ${PARSEANDEVAL_OBJS} -o parseAndEval -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
+ $(CXX) $(CFLAGS) ${PARSEANDEVAL_OBJS} -o parseAndEval -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
PARSE_OBJS = \
@@ -100,7 +100,7 @@ PARSE_OBJS = \
parseIt.o
parseIt: $(PARSE_OBJS)
- g++ $(CFLAGS) $(PARSE_OBJS) -o parseIt -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
+ $(CXX) $(CFLAGS) $(PARSE_OBJS) -o parseIt -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
OPARSE_OBJS = \
@@ -141,7 +141,7 @@ OPARSE_OBJS = \
oparseIt.o
oparseIt: $(OPARSE_OBJS)
- g++ $(CFLAGS) $(PARSE_OBJS) -o oparseIt
+ $(CXX) $(CFLAGS) $(PARSE_OBJS) -o oparseIt
FPT_OBJS = \
@@ -151,7 +151,7 @@ FPT_OBJS = \
finPTest.o
finPTest: $(FPT_OBJS)
- g++ $(CFLAGS) $(FPT_OBJS) -o finPTest
+ $(CXX) $(CFLAGS) $(FPT_OBJS) -o finPTest
@@ -194,5 +194,5 @@ EVALTREE_OBJS = \
evalTree.o
evalTree: $(EVALTREE_OBJS)
- g++ $(CFLAGS) ${EVALTREE_OBJS} -o evalTree -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
+ $(CXX) $(CFLAGS) ${EVALTREE_OBJS} -o evalTree -D_REENTRANT -D_XOPEN_SOURCE=600 -lpthread
View
26 first-stage/TRAIN/Makefile
@@ -15,7 +15,7 @@ default: all
# this rule automatically makes our dependency files.
# run "make Makefile.dep" if you add any files or change dependencies.
Makefile.dep:
- gcc -MM *.C > Makefile.dep
+ $(CXX) -MM *.C > Makefile.dep
# include the automatically generated dependency files
-include Makefile.dep
@@ -159,7 +159,7 @@ $(DATA)/ww.g : kn3Counts $(DATA)/pSgT.txt
# Build Training programs
.C.o:
- g++ $(CFLAGS) -c $<
+ $(CXX) $(CFLAGS) -c $<
RCOUNTS_OBJS = \
ClassRule.o \
@@ -180,7 +180,7 @@ RCOUNTS_OBJS = \
utils.o \
rCounts.o
rCounts: $(RCOUNTS_OBJS)
- g++ $(CFLAGS) $(RCOUNTS_OBJS) -o rCounts
+ $(CXX) $(CFLAGS) $(RCOUNTS_OBJS) -o rCounts
ISCALE_OBJS = \
ECArgs.o \
@@ -194,7 +194,7 @@ ISCALE_OBJS = \
utils.o \
iScale.o
iScale: $(ISCALE_OBJS)
- g++ $(CFLAGS) $(ISCALE_OBJS) -o iScale
+ $(CXX) $(CFLAGS) $(ISCALE_OBJS) -o iScale
SELFEATS_OBJS = \
ECArgs.o \
@@ -209,7 +209,7 @@ SELFEATS_OBJS = \
utils.o \
selFeats.o
selFeats: $(SELFEATS_OBJS)
- g++ $(CFLAGS) $(SELFEATS_OBJS) -o selFeats
+ $(CXX) $(CFLAGS) $(SELFEATS_OBJS) -o selFeats
TRAINRS_OBJS = \
@@ -233,7 +233,7 @@ TRAINRS_OBJS = \
utils.o \
trainRs.o
trainRs: $(TRAINRS_OBJS)
- g++ $(CFLAGS) $(TRAINRS_OBJS) -o trainRs
+ $(CXX) $(CFLAGS) $(TRAINRS_OBJS) -o trainRs
KN3COUNTS_OBJS = \
@@ -257,7 +257,7 @@ KN3COUNTS_OBJS = \
utils.o \
kn3Counts.o
kn3Counts: $(KN3COUNTS_OBJS)
- g++ $(CFLAGS) $(KN3COUNTS_OBJS) -o kn3Counts
+ $(CXX) $(CFLAGS) $(KN3COUNTS_OBJS) -o kn3Counts
AUXIT_OBJS = \
BrownIter.o \
@@ -271,7 +271,7 @@ AUXIT_OBJS = \
auxify.o \
auxIt.o
auxIt: $(AUXIT_OBJS)
- g++ $(AUXIT_OBJS) -o auxIt
+ $(CXX) $(AUXIT_OBJS) -o auxIt
PSGT_OBJS = \
ECArgs.o \
@@ -285,7 +285,7 @@ PSGT_OBJS = \
UnitRules.o \
pSgT.o
pSgT: $(PSGT_OBJS)
- g++ $(PSGT_OBJS) -o pSgT
+ $(CXX) $(PSGT_OBJS) -o pSgT
PTGNT_OBJS = \
@@ -300,7 +300,7 @@ PTGNT_OBJS = \
utils.o \
pTgNt.o
pTgNt: $(PTGNT_OBJS)
- g++ $(PTGNT_OBJS) -o pTgNt
+ $(CXX) $(PTGNT_OBJS) -o pTgNt
PSFGT_OBJS = \
ECArgs.o \
@@ -314,7 +314,7 @@ PSFGT_OBJS = \
utils.o \
pSfgT.o
pSfgT: $(PSFGT_OBJS)
- g++ $(PSFGT_OBJS) -o pSfgT
+ $(CXX) $(PSFGT_OBJS) -o pSfgT
PUGT_OBJS = \
ECArgs.o \
@@ -329,7 +329,7 @@ PUGT_OBJS = \
utils.o \
pUgT.o
pUgT: $(PUGT_OBJS)
- g++ $(PUGT_OBJS) -o pUgT
+ $(CXX) $(PUGT_OBJS) -o pUgT
GETPROBS_OBJS = \
ClassRule.o \
@@ -352,7 +352,7 @@ GETPROBS_OBJS = \
trainRsUtils.o \
getProbs.o
getProbs:$(GETPROBS_OBJS)
- g++ $(CFLAGS) $(GETPROBS_OBJS) -o getProbs
+ $(CXX) $(CFLAGS) $(GETPROBS_OBJS) -o getProbs
all: rCounts selFeats iScale trainRs pSgT pTgNt pUgT kn3Counts pSfgT
View
8 second-stage/programs/features/Makefile
@@ -7,25 +7,25 @@ FOPENMP=-fopenmp
top: $(TARGETS)
extract-nmfeatures.o: extract-nmfeatures.cc
- g++ -c $(CXXFLAGS) $(FOPENMP) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $(FOPENMP) $< -o $@
extract-nmfeatures: extract-nmfeatures.o heads.o read-tree.o sym.o
$(CXX) $(LDFLAGS) $(FOPENMP) $^ -o $@
best-nmparses.o: best-nmparses.cc
- g++ -c $(CXXFLAGS) $(FOPENMP) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $(FOPENMP) $< -o $@
best-nmparses: best-nmparses.o heads.o read-tree.o sym.o
$(CXX) $(LDFLAGS) $(FOPENMP) $^ -o $@
extract-spmfeatures.o: extract-spmfeatures.cc
- g++ -c $(CXXFLAGS) $(FOPENMP) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $(FOPENMP) $< -o $@
extract-spmfeatures: extract-spmfeatures.o heads.o read-tree.o sym.o
$(CXX) $(LDFLAGS) $(FOPENMP) $^ -o $@
best-spmparses.o: best-spmparses.cc
- g++ -c $(CXXFLAGS) $(FOPENMP) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $(FOPENMP) $< -o $@
best-spmparses: best-spmparses.o heads.o read-tree.o sym.o
$(CXX) $(LDFLAGS) $(FOPENMP) $^ -o $@
View
4 second-stage/programs/prepare-data/Makefile
@@ -2,8 +2,8 @@ TARGETS = copy-trees-ss prepare-new-data prepare-ec-data ptb
top: $(TARGETS)
-CXX = g++
-CC = $(CXX)
+# CXX = g++
+# CC = $(CXX)
# CFLAGS = -MMD -O6 -Wall -ffast-math -finline-functions -fstrict-aliasing $(GCCFLAGS)
# CFLAGS = -g -MMD -Wall

0 comments on commit 8170b00

Please sign in to comment.
Something went wrong with that request. Please try again.