[llvm-commits] [pre-11] CVS: llvm/Makefile.common Makefile

[John Criswell]

Changes in directory llvm:

Makefile.common updated: 1.108.2.1 -> 1.108.2.2
Makefile updated: 1.4 -> 1.4.8.1

---
Log message:

Fixed the distsclean target so that it works properly:
	o It does not remove the LLVM Makefiles when called from a project.
	o It does not work in any other directory other than the root
	  directory.
	o Dependencies are not loaded when the target is distclean.
To do this, I moved the distclean target from Makefile.common to Makefile and
added conditional includes around the Makefile.common section that includes
dependencies.


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.108.2.1 llvm/Makefile.common:1.108.2.2
--- llvm/Makefile.common:1.108.2.1	Thu Aug  7 10:51:08 2003
+++ llvm/Makefile.common	Mon Aug 11 18:00:23 2003
@@ -808,12 +808,6 @@
 	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
 	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 
-distclean:: clean
-	$(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \
-	            $(LEVEL)/include/Config/config.h \
-	            $(LEVEL)/autom4te.cache \
-	            $(LEVEL)/config.log)
-
 ###########################################################################
 # C/C++ Dependencies
 #	Define variables and rules that generate header file dependencies
@@ -841,7 +835,9 @@
 # are cleaning (this example taken from the GNU Make Manual).
 #
 ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(SourceDepend),)
 -include $(SourceDepend)
+endif
 endif
 endif


Index: llvm/Makefile
diff -u llvm/Makefile:1.4 llvm/Makefile:1.4.8.1
--- llvm/Makefile:1.4	Wed Jun 11 08:55:26 2003
+++ llvm/Makefile	Mon Aug 11 18:00:23 2003
@@ -6,3 +6,10 @@
 
 test :: all
 	cd test; $(MAKE)
+
+distclean:: clean
+	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
+	                  $(LEVEL)/include/Config/config.h \
+	                  $(LEVEL)/autoconf/autom4te.cache \
+	                  $(LEVEL)/config.log
+