[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.239 -> 1.240
---
Log message:

* Allow date command to be printed in verbose mode
* Get rid of appending -lbz2 and -lz to ExtraLibs now that we don't need
  them any more.
* Fix the dist-check target so that EXTRA_DIST can be defined AFTER the
  include of Makefile.common. This is needed because Makefile.common 
  provides variable definitions that may need to be used in computing the
  value of EXTRA_DIST.
* Clean up some "distdir" target output.


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

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.239 llvm/Makefile.rules:1.240
--- llvm/Makefile.rules:1.239	Mon Nov 22 23:59:53 2004
+++ llvm/Makefile.rules	Sun Nov 28 23:00:33 2004
@@ -341,7 +341,7 @@
 # To create other directories, as needed, and timestamp their creation
 %/.dir:
 	$(Verb) $(MKDIR) $* > /dev/null
-	@$(DATE) > $@
+	$(Verb) $(DATE) > $@
 
 .PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(ExmplDir)/.dir
 .PRECIOUS: $(LLVMLibDir)/.dir $(LLVMToolDir)/.dir $(LLVMExmplDir)/.dir
@@ -636,17 +636,6 @@
 LLVMLibsPaths   := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs))
 
 #---------------------------------------------------------
-# Handle optional compression libraries automatically
-#---------------------------------------------------------
-ExtraLibs := $(LIBS)
-ifeq ($(HAVE_BZIP2),1)
-ExtraLibs += -lbz2
-endif
-ifeq ($(HAVE_ZLIB),1)
-ExtraLibs += -lz
-endif
-
-#---------------------------------------------------------
 # Tell make that we need to rebuild subdirectories before 
 # we can link the tool. This affects things like LLI which 
 # has library subdirectories.
@@ -1003,9 +992,9 @@
                $(BUILD_SRC_DIR)/*.def \
                $(BUILD_SRC_DIR)/*.ll \
                $(BUILD_SRC_DIR)/*.in))
-DistSources := $(Sources) $(EXTRA_DIST)
 DistSubDirs := $(SubDirs)
-DistFiles   := $(DistAlways) $(DistSources) $(DistOther)
+DistSources  = $(Sources) $(EXTRA_DIST)
+DistFiles    = $(DistAlways) $(DistSources) $(DistOther)
 
 #------------------------------------------------------------------------
 # We MUST build distribution with OBJ_DIR != SRC_DIR
@@ -1044,13 +1033,15 @@
 
 $(DistTarGZip) : distdir
 	$(Echo) Packing gzipped distribution tar file.
-	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | gzip -c > "$(DistTarGZip)"
+	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \
+	  $(GZIP) -c > "$(DistTarGZip)"
 
 dist-bzip2:: $(DistTarBZ2)
 
 $(DistTarBZ2) : distdir
 	$(Echo) Packing bzipped distribution tar file.
-	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | $(BZIP2) -c >$(DistTarBZ2)
+	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \
+	  $(BZIP2) -c >$(DistTarBZ2)
 
 dist-zip:: $(DistZip)
 
@@ -1095,7 +1086,6 @@
 # Provide the recursive distdir target for building the distribution directory
 #------------------------------------------------------------------------
 distdir : $(DistSources)
-	$(Echo) Building Distribution Directory $(DistDir)
 	$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
 	  if test -d "$(DistDir)" ; then \
 	    find $(DistDir) -type d ! -perm -200 -exec chmod u+w {} ';'  || \
@@ -1104,6 +1094,7 @@
 	  $(EchoCmd) Removing $(DistDir) ; \
 	  $(RM) -rf $(DistDir); \
 	fi
+	$(Echo) Building Distribution Directory $(DistDir)
 	$(Verb) $(MKDIR) $(DistDir) 
 	$(Verb) srcdirstrip=`echo "$(BUILD_SRC_DIR)" | sed 's|.|.|g'`; \
 	srcrootstrip=`echo "$(BUILD_SRC_ROOT)" | sed 's|.|.|g'`; \