X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=e9cbc789ced47843fec5283b483579fab0595d63;hb=a8d451e1d4c5fbec7fbfefbb07a392cbb3c83bc4;hp=a3fc51f1c88d1671a4debd566b6d765eeafd8a41;hpb=f29202149ef7cc6f7ff538d134d657ee6f034255;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index a3fc51f1c88..e9cbc789ced 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,44 @@
-##===- ./Makefile ------------------------------------------*- Makefile -*-===##
+#===- ./Makefile -------------------------------------------*- Makefile -*--===#
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file was developed by the LLVM research group and is distributed under
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/Support utils lib tools runtime
-OPTIONAL_DIRS = projects
+DIRS = lib/System lib/Support utils lib tools 
 
-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:
-	@for dir in lib/Support utils lib tools; do $(MAKE) -C $$dir; done
-
-configure: autoconf/configure.ac autoconf/aclocal.m4
-	cd autoconf && aclocal && autoconf -o ../configure configure.ac
+ifneq ($(MAKECMDGOALS),tools-only)
+DIRS += runtime docs
+OPTIONAL_DIRS = examples projects
+endif
 
-include/Config/config.h.in: autoconf/configure.ac autoconf/aclocal.m4
-	autoheader -I autoconf autoconf/configure.ac
+EXTRA_DIST := test llvm.spec include
 
-# Install support for llvm include files.
-
-.PHONY: install-includes
-
-install-includes:
-	$(MKDIR) $(includedir)/llvm
-	cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(includedir)/llvm
-
-install:: install-includes
+include $(LEVEL)/Makefile.common
 
+.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 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
+
+tools-only: all