Commits

Vlad Niculae committed fb78a23

FIX: consistent use of CC and CXX envs

  • Participants
  • Parent commits 288bdf2

Comments (0)

Files changed (5)

File evalb/Makefile

 all: evalb
 
 evalb: evalb.c
-	gcc -Wall -g -o evalb evalb.c
+	$(CC) -Wall -g -o evalb evalb.c

File first-stage/PARSE/Makefile

 # 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
 CFLAGS=-Wall -O3 -fPIC
 # CFLAGS=-g
 .C.o:
-	g++ $(CFLAGS) -c $<
+	$(CXX) $(CFLAGS) -c $<
 
 PARSEANDEVAL_OBJS = \
 	Bchart.o \
 	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 = \
 	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 = \
 	oparseIt.o 
 
 oparseIt: $(OPARSE_OBJS)
-	g++ $(CFLAGS) $(PARSE_OBJS) -o oparseIt 
+	$(CXX) $(CFLAGS) $(PARSE_OBJS) -o oparseIt 
 
 
 FPT_OBJS = \
 	finPTest.o
 
 finPTest: $(FPT_OBJS)
-	g++ $(CFLAGS) $(FPT_OBJS) -o finPTest
+	$(CXX) $(CFLAGS) $(FPT_OBJS) -o finPTest
 
 
 
 	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
 

File first-stage/TRAIN/Makefile

 # 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
 # Build Training programs
 
 .C.o:
-	g++ $(CFLAGS) -c $<
+	$(CXX) $(CFLAGS) -c $<
  
 RCOUNTS_OBJS = \
 	ClassRule.o \
 	utils.o \
 	rCounts.o
 rCounts: $(RCOUNTS_OBJS)
-	g++ $(CFLAGS) $(RCOUNTS_OBJS) -o rCounts 
+	$(CXX) $(CFLAGS) $(RCOUNTS_OBJS) -o rCounts 
 
 ISCALE_OBJS = \
 	ECArgs.o \
 	utils.o \
 	iScale.o
 iScale: $(ISCALE_OBJS)
-	g++ $(CFLAGS) $(ISCALE_OBJS) -o iScale 
+	$(CXX) $(CFLAGS) $(ISCALE_OBJS) -o iScale 
  
 SELFEATS_OBJS = \
 	ECArgs.o \
 	utils.o \
 	selFeats.o
 selFeats: $(SELFEATS_OBJS)
-	g++ $(CFLAGS) $(SELFEATS_OBJS) -o selFeats 
+	$(CXX) $(CFLAGS) $(SELFEATS_OBJS) -o selFeats 
 
  
 TRAINRS_OBJS = \
 	utils.o \
 	trainRs.o
 trainRs: $(TRAINRS_OBJS)
-	g++ $(CFLAGS) $(TRAINRS_OBJS) -o trainRs 
+	$(CXX) $(CFLAGS) $(TRAINRS_OBJS) -o trainRs 
 
  
 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 \
 	auxify.o \
 	auxIt.o
 auxIt: $(AUXIT_OBJS)
-	g++ $(AUXIT_OBJS) -o auxIt
+	$(CXX) $(AUXIT_OBJS) -o auxIt
 
 PSGT_OBJS = \
 	ECArgs.o \
 	UnitRules.o \
 	pSgT.o
 pSgT: $(PSGT_OBJS)
-	g++ $(PSGT_OBJS) -o pSgT
+	$(CXX) $(PSGT_OBJS) -o pSgT
 
 
 PTGNT_OBJS = \
 	utils.o \
 	pTgNt.o
 pTgNt: $(PTGNT_OBJS)
-	g++ $(PTGNT_OBJS) -o pTgNt
+	$(CXX) $(PTGNT_OBJS) -o pTgNt
 
 PSFGT_OBJS = \
 	ECArgs.o \
 	utils.o \
 	pSfgT.o
 pSfgT: $(PSFGT_OBJS)
-	g++ $(PSFGT_OBJS) -o pSfgT
+	$(CXX) $(PSFGT_OBJS) -o pSfgT
 
 PUGT_OBJS = \
 	ECArgs.o \
 	utils.o \
 	pUgT.o
 pUgT: $(PUGT_OBJS)
-	g++ $(PUGT_OBJS) -o pUgT
+	$(CXX) $(PUGT_OBJS) -o pUgT
 
 GETPROBS_OBJS = \
 	ClassRule.o \
 	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 
 

File second-stage/programs/features/Makefile

 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 $@

File second-stage/programs/prepare-data/Makefile

 
 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