X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=b474a3a0674e65e1c1380d9c89a7d1da534230ce;hb=a1ab72daadbdc5b499ce7e7e97c4b80efad46736;hp=c11e7946cd5b4fc3a388e10ff2e6f76c2fad20d7;hpb=90c29494121e3a4cefb5cae5d272178bbc49d3a9;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index c11e7946cd5..b474a3a0674 100644
--- a/Makefile
+++ b/Makefile
@@ -7,23 +7,41 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib tools 
+DIRS = lib/System lib/Support utils lib
 
-
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime
-OPTIONAL_DIRS = examples projects
+ifeq ($(MAKECMDGOALS),tools-only)
+DIRS += tools
+else
+  ifneq ($(MAKECMDGOALS),libs-only)
+    DIRS += tools runtime docs
+    OPTIONAL_DIRS = examples projects
+  endif
 endif
 
 EXTRA_DIST := test llvm.spec include
 
 include $(LEVEL)/Makefile.common
 
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
+
+.PHONY: debug-opt-prof
+debug-opt-prof:
+	$(Echo) Building Debug Version
+	$(Verb) $(MAKE)
+	$(Echo)
+	$(Echo) Building Optimized Version
+	$(Echo)
+	$(Verb) $(MAKE) ENABLE_OPTIMIZED=1
+	$(Echo)
+	$(Echo) Building Profiling Version
+	$(Echo)
+	$(Verb) $(MAKE) ENABLE_PROFILING=1
+
 dist-hook::
-	@$(ECHO) Eliminating CVS directories from distribution
-	$(VERB) rm -rf `find $(TopDistDir) -type d -name CVS -print`
-	@$(ECHO) Eliminating files constructed by configure
-	$(VERB) rm -f \
+	$(Echo) Eliminating files constructed by configure
+	$(Verb) $(RM) -f \
 	  $(TopDistDir)/include/llvm/ADT/hash_map  \
 	  $(TopDistDir)/include/llvm/ADT/hash_set  \
 	  $(TopDistDir)/include/llvm/ADT/iterator  \
@@ -31,7 +49,23 @@ dist-hook::
 	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
 	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
-test :: all
-	cd test; $(MAKE)
-
 tools-only: all
+libs-only: all
+
+#------------------------------------------------------------------------
+# Make sure the generated headers are up-to-date. This must be kept in
+# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
+#------------------------------------------------------------------------
+FilesToConfig := \
+  include/llvm/Config/config.h \
+  include/llvm/Support/DataTypes.h \
+  include/llvm/ADT/hash_map \
+  include/llvm/ADT/hash_set \
+  include/llvm/ADT/iterator
+FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
+
+all-local:: $(FilesToConfigPATH)
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+	$(Echo) Regenerating $*
+	$(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
+.PRECIOUS: $(FilesToConfigPATH)