X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=b474a3a0674e65e1c1380d9c89a7d1da534230ce;hb=eb853a498f124d6012e678d3c48bf9edd4fda8ad;hp=ddc782380e8dac56fda2c7576510717bc1983f5b;hpb=4f840ed7e0dd2bf43d22054352e0d68b9d4df8c7;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index ddc782380e8..b474a3a0674 100644
--- a/Makefile
+++ b/Makefile
@@ -7,46 +7,65 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/Support utils lib tools 
+DIRS = lib/System lib/Support utils lib
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime
-OPTIONAL_DIRS = projects
+ifeq ($(MAKECMDGOALS),tools-only)
+DIRS += tools
+else
+  ifneq ($(MAKECMDGOALS),libs-only)
+    DIRS += tools runtime docs
+    OPTIONAL_DIRS = examples projects
+  endif
 endif
 
-include $(LEVEL)/Makefile.common
-
-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 \
-	                  $(LEVEL)/TAGS
-
-tools-only: all
+EXTRA_DIST := test llvm.spec include
 
-# Install support for llvm include files:
-.PHONY: install-includes
-
-install-includes:
-	$(MKDIR) $(DESTDIR)$(includedir)/llvm
-	cd include && find * -path '*/Internal' -prune -o '(' '!' '(' -name '*~' -o -name .cvsignore ')' -print ')' | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
-ifneq ($(BUILD_SRC_ROOT),$(BUILD_OBJ_ROOT))
-	cd $(BUILD_SRC_ROOT)/include && find * -path '*/Internal' -prune -o '(' '!' '(' -name '*~' -o -name .cvsignore ')' -print ')' | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
-endif
+include $(LEVEL)/Makefile.common
 
-install:: install-includes
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
 
-# Build tags database for Emacs/Xemacs:
-.PHONY: tags
+.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
 
-TAGS: tags
+dist-hook::
+	$(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  \
+	  $(TopDistDir)/include/llvm/Config/config.h  \
+	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
+	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
-all:: tags
+tools-only: all
+libs-only: all
 
-tags:
-	$(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
+#------------------------------------------------------------------------
+# 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)