Update polygen grammar for recent language changes.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index dcb98fc36f174e2deea0915dddf4a2749b3e8d88..d453330a2e9dd41baabfdd7f7d3f42bba0dc8434 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 # 
 #                     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.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
 
@@ -17,11 +17,18 @@ LEVEL := .
 #   5. Build llvm-config, which determines inter-lib dependencies for tools.
 #   6. Build tools, runtime, docs.
 #
-DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
-        tools runtime docs
+# When cross-compiling, there are some things (tablegen) that need to
+# be build for the build system first.
+ifeq ($(BUILD_DIRS_ONLY),1)
+  DIRS := lib/System lib/Support utils
+  OPTIONAL_DIRS :=
+else
+  DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+          tools runtime docs
+  OPTIONAL_DIRS := examples projects bindings
+endif
 
-OPTIONAL_DIRS := examples projects bindings
-EXTRA_DIST := test llvm.spec include win32 Xcode
+EXTRA_DIST := test unittests llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config 
 
@@ -47,6 +54,11 @@ ifeq ($(MAKECMDGOALS),tools-only)
   OPTIONAL_DIRS :=
 endif
 
+ifeq ($(MAKECMDGOALS),unittests)
+  DIRS := $(filter-out tools runtime docs, $(DIRS)) utils unittests
+  OPTIONAL_DIRS :=
+endif
+
 # Don't install utils, examples, or projects they are only used to 
 # build LLVM.
 ifeq ($(MAKECMDGOALS),install)
@@ -54,6 +66,23 @@ ifeq ($(MAKECMDGOALS),install)
   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
+# If we're cross-compiling, build the build-hosted tools first
+ifeq ($(LLVM_CROSS_COMPILING),1)
+all:: cross-compile-build-tools
+
+clean::
+       $(Verb) rm -rf BuildTools
+
+cross-compile-build-tools:
+       $(Verb) if [ ! -f BuildTools/Makefile ]; then \
+          $(MKDIR) BuildTools; \
+         cd BuildTools ; \
+         $(PROJ_SRC_DIR)/configure ; \
+         cd .. ; \
+       fi; \
+        ($(MAKE) -C BuildTools BUILD_DIRS_ONLY=1 ) || exit 1;
+endif
+
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
@@ -77,9 +106,9 @@ debug-opt-prof:
 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/ADT/hash_map.h  \
+         $(TopDistDir)/include/llvm/ADT/hash_set.h  \
+         $(TopDistDir)/include/llvm/ADT/iterator.h  \
          $(TopDistDir)/include/llvm/Config/config.h  \
          $(TopDistDir)/include/llvm/Support/DataTypes.h  \
          $(TopDistDir)/include/llvm/Support/ThreadSupport.h
@@ -95,9 +124,9 @@ install-libs: install
 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
+  include/llvm/ADT/hash_map.h \
+  include/llvm/ADT/hash_set.h \
+  include/llvm/ADT/iterator.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
 all-local:: $(FilesToConfigPATH)
@@ -108,12 +137,15 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
 
 # NOTE: This needs to remain as the last target definition in this file so
 # that it gets executed last.
+ifneq ($(BUILD_DIRS_ONLY),1)
 all:: 
        $(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
        $(Echo) '*****' Note: Debug build can be 10 times slower than an
        $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
-       $(Echo) '*****' make an optimized build.
+       $(Echo) '*****' make an optimized build. Alternatively you can
+       $(Echo) '*****' configure with --enable-optimized.
+endif
 endif
 
 check-llvm2cpp:
@@ -141,5 +173,22 @@ build-for-llvm-top:
        fi
        $(Verb) $(MAKE) tools-only
 
-.PHONY: srpm rpm
+SVN = svn
+SVN-UPDATE-OPTIONS =
+AWK = awk
+SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
+               | LANG=C xargs $(SVN) info 2>/dev/null \
+               | $(AWK) '/Path:\ / {print $$2}'
+
+update:
+       $(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)
+       @ $(SVN) status $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
+
+happiness: update all check unittests
+
+.PHONY: srpm rpm update happiness
+
+# declare all targets at this level to be serial:
+
+.NOTPARALLEL: