Update the auto* tools: autoconf 2.60, libtool 1.5.22, automake 1.9.6.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index c412b2617907bc34483ee772f53290725d025e94..b48b49b16762ee9f6e6b75fe626fe8dbeef6271b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,47 +6,97 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
-LEVEL = .
-DIRS = lib/Support utils lib tools 
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime
-OPTIONAL_DIRS = examples projects
+LEVEL := .
+DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
+OPTIONAL_DIRS := examples projects
+EXTRA_DIST := test llvm.spec include win32 Xcode
+
+include $(LEVEL)/Makefile.config 
+
+# llvm-gcc4 doesn't need runtime libs.
+ifeq ($(LLVMGCC_MAJVERS),4)
+  DIRS := $(filter-out runtime, $(DIRS))
 endif
 
-include $(LEVEL)/Makefile.common
+ifeq ($(MAKECMDGOALS),libs-only)
+  DIRS := $(filter-out tools runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
+ifeq ($(MAKECMDGOALS),tools-only)
+  DIRS := $(filter-out runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
 
-test :: all
-       cd test; $(MAKE)
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
 
-distclean:: clean
-       $(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
-                         $(LEVEL)/include/Config/config.h \
-                         $(LEVEL)/autoconf/autom4te.cache \
-                         $(LEVEL)/config.log \
-                         $(LEVEL)/TAGS
+# Include the main makefile machinery.
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
-tools-only: all
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
 
-# Install support for llvm include files:
-.PHONY: install-includes
+.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
 
-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
+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
 
-install:: install-includes
+tools-only: all
+libs-only: all
 
-# Build tags database for Emacs/Xemacs:
-.PHONY: tags
+#------------------------------------------------------------------------
+# 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))
 
-TAGS: tags
+all-local:: $(FilesToConfigPATH)
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+       $(Echo) Regenerating $*
+       $(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
+.PRECIOUS: $(FilesToConfigPATH)
 
-all::
+# NOTE: This needs to remain as the last target definition in this file so
+# that it gets executed last.
+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.
+endif
 
-tags:
-       find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h' | $(ETAGS) $(ETAGSFLAGS) -
+check-llvm2cpp:
+       $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1