[llvm-commits] CVS: llvm/runtime/GCCLibraries/crtend/Makefile

[Reid Spencer]

Changes in directory llvm/runtime/GCCLibraries/crtend:

Makefile updated: 1.17 -> 1.18
---
Log message:

* Make the libcrtend.a installation depend on the bytecode-libs directory
* Conform output to standard.


---
Diffs of the changes:  (+7 -8)

Index: llvm/runtime/GCCLibraries/crtend/Makefile
diff -u llvm/runtime/GCCLibraries/crtend/Makefile:1.17 llvm/runtime/GCCLibraries/crtend/Makefile:1.18
--- llvm/runtime/GCCLibraries/crtend/Makefile:1.17	Tue Oct 26 02:02:58 2004
+++ llvm/runtime/GCCLibraries/crtend/Makefile	Tue Oct 26 16:30:31 2004
@@ -32,8 +32,9 @@
 all:: $(CRTEND_A)
 
 # Installation simply requires copying the archive to it's new home.
-$(DESTDIR)$(bytecode_libdir)/libcrtend.a: $(CRTEND_A)
-	$(INSTALL) $(CRTEND_A) $(DESTDIR)$(bytecode_libdir)
+$(bytecode_libdir)/libcrtend.a: $(CRTEND_A) $(bytecode_libdir)
+	@$(ECHO) Installing $(CRTEND_A)
+	$(VERB) $(INSTALL) $(CRTEND_A) $(bytecode_libdir)
 
 install:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
 install-bytecode:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
@@ -46,7 +47,7 @@
 
 # We build libcrtend.a from the four components described in the README.
 $(CRTEND_A) : $(ComponentLibs) $(LIBDIR)/.dir
-	@echo Building final libcrtend.a file from components
+	@$(ECHO) Building final libcrtend.a file from components
 	$(VERB) $(Archive) $@ $(ComponentLibs)
 
 MainObj      := $(OBJDIR)/crtend.bc $(OBJDIR)/listend.bc
@@ -55,17 +56,15 @@
 
 # __main and ctor/dtor support component
 $(OBJDIR)/comp_main.bc: $(MainObj)
-	@echo Linking $(notdir $@) component...
+	@$(ECHO) Linking $(notdir $@) component...
 	$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_main.lst $(MainObj) -o $@
 
 # Generic exception handling support runtime.
 $(OBJDIR)/comp_genericeh.bc: $(GenericEHObj)
-	@echo Linking $(notdir $@) component...
+	@$(ECHO) Linking $(notdir $@) component...
 	$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_genericeh.lst $(GenericEHObj) -o $@
 
 # setjmp/longjmp exception handling support runtime.
 $(OBJDIR)/comp_sjljeh.bc: $(SJLJEHObj)
-	@echo Linking $(notdir $@) component...
+	@$(ECHO) Linking $(notdir $@) component...
 	$(VERB) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_sjljeh.lst $(SJLJEHObj) -o $@
-
-