[llvm-commits] CVS: reopt/lib/WholeReoptimizer/Makefile

[Brian Gaeke]

Changes in directory reopt/lib/WholeReoptimizer:

Makefile updated: 1.5 -> 1.6
---
Log message:

Unbreak this makefile again...many variables seem to have changed names


---
Diffs of the changes:  (+22 -24)

Index: reopt/lib/WholeReoptimizer/Makefile
diff -u reopt/lib/WholeReoptimizer/Makefile:1.5 reopt/lib/WholeReoptimizer/Makefile:1.6
--- reopt/lib/WholeReoptimizer/Makefile:1.5	Thu Oct 28 11:14:27 2004
+++ reopt/lib/WholeReoptimizer/Makefile	Mon Nov  8 15:28:17 2004
@@ -2,38 +2,36 @@
 
 include $(LEVEL)/Makefile.common
 
-REOPTLIBDIR = $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
-
-REOPTIMIZER_OBJS = $(REOPTLIBDIR)/firstTrigger.o \
-	$(REOPTLIBDIR)/tracecache.o $(REOPTLIBDIR)/mapinfo.o \
-	$(REOPTLIBDIR)/scratchmemory.o $(REOPTLIBDIR)/tracetofunction.o \
-	$(REOPTLIBDIR)/tracejit.o $(REOPTLIBDIR)/traceio.o
+REOPTIMIZER_OBJS = $(LibDir)/firstTrigger.o \
+	$(LibDir)/tracecache.o $(LibDir)/mapinfo.o \
+	$(LibDir)/scratchmemory.o $(LibDir)/tracetofunction.o \
+	$(LibDir)/tracejit.o $(LibDir)/traceio.o
 
 # Object files that contain common LLVM code the Reoptimizer depends on
-REOPTIMIZER_LLVMOBJS = $(LLVMLIBDIR)/LLVMCore.o $(LLVMLIBDIR)/LLVMBCReader.o \
-	$(LLVMLIBDIR)/LLVMBCWriter.o $(LLVMLIBDIR)/LLVMSparcV9.o \
-	$(LLVMLIBDIR)/LLVMSparcV9LiveVar.o $(LLVMLIBDIR)/LLVMSparcV9InstrSched.o \
-	$(LLVMLIBDIR)/LLVMCodeGen.o $(LLVMLIBDIR)/LLVMExecutionEngine.o \
-	$(LLVMLIBDIR)/LLVMJIT.o $(LLVMLIBDIR)/LLVMInterpreter.o
+REOPTIMIZER_LLVMOBJS = $(LLVMLibDir)/LLVMCore.o $(LLVMLibDir)/LLVMBCReader.o \
+	$(LLVMLibDir)/LLVMBCWriter.o $(LLVMLibDir)/LLVMSparcV9.o \
+	$(LLVMLibDir)/LLVMSparcV9LiveVar.o $(LLVMLibDir)/LLVMSparcV9InstrSched.o \
+	$(LLVMLibDir)/LLVMCodeGen.o $(LLVMLibDir)/LLVMExecutionEngine.o \
+	$(LLVMLibDir)/LLVMJIT.o $(LLVMLibDir)/LLVMInterpreter.o
 
 # Library archive files that contain common LLVM code the Reoptimizer depends on
-REOPTIMIZER_LLVMLIBS = $(LLVMLIBDIR)/libLLVMSparcV9RegAlloc.a \
-	$(LLVMLIBDIR)/libLLVMTarget.a $(LLVMLIBDIR)/libLLVMScalarOpts.a \
-	$(LLVMLIBDIR)/libLLVMTransformUtils.a $(LLVMLIBDIR)/libLLVMAnalysis.a \
-	$(LLVMLIBDIR)/libLLVMSupport.a $(LLVMLIBDIR)/libLLVMSystem.a
+REOPTIMIZER_LLVMLIBS = $(LLVMLibDir)/libLLVMSparcV9RegAlloc.a \
+	$(LLVMLibDir)/libLLVMTarget.a $(LLVMLibDir)/libLLVMScalarOpts.a \
+	$(LLVMLibDir)/libLLVMTransformUtils.a $(LLVMLibDir)/libLLVMAnalysis.a \
+	$(LLVMLibDir)/libLLVMSupport.a $(LLVMLibDir)/libLLVMSystem.a
 
-WHOLE_REOPTIMIZER_LIB = $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)/libwholereoptimizer.a
+WHOLE_REOPTIMIZER_LIB = $(LibDir)/libwholereoptimizer.a
 
 all:: $(WHOLE_REOPTIMIZER_LIB)
 
 $(WHOLE_REOPTIMIZER_LIB): $(REOPTIMIZER_OBJS) $(REOPTIMIZER_LLVMOBJS) $(REOPTIMIZER_LLVMLIBS)
-	$(VERB) rm -f $@
-	@$(ECHO) "Building $(WHOLE_REOPTIMIZER_LIB)"
-	@$(ECHO) "Adding reoptimizer .o files to libwholereoptimizer.a"
-	$(VERB) ar rc $@ $(REOPTIMIZER_OBJS) $(REOPTIMIZER_LLVMOBJS)
-	$(VERB) @for lib in $(REOPTIMIZER_LLVMLIBS); \
+	$(Verb) rm -f $@
+	@$(Echo) "Building $(WHOLE_REOPTIMIZER_LIB)"
+	@$(Echo) "Adding reoptimizer .o files to libwholereoptimizer.a"
+	$(Verb) ar rc $@ $(REOPTIMIZER_OBJS) $(REOPTIMIZER_LLVMOBJS)
+	$(Verb) @for lib in $(REOPTIMIZER_LLVMLIBS); \
 	do \
-		$(ECHO) "Adding files from $${lib} to libwholereoptimizer.a"; \
+		$(EchoCmd) "Adding files from $${lib} to libwholereoptimizer.a"; \
 		d=`basename $${lib}`x; \
 		mkdir $${d}; \
 		cd $${d}; \
@@ -42,8 +40,8 @@
 		cd ..; \
 		rm -rf $${d}; \
 	done
-	@$(ECHO) "======= Finished building libwholereoptimizer.a"
+	@$(Echo) "======= Finished building libwholereoptimizer.a"
 
 clean::
-	$(VERB) rm -f $(WHOLE_REOPTIMIZER_LIB)
+	$(Verb) rm -f $(WHOLE_REOPTIMIZER_LIB)