Do not use variable sized arrays in C++, they are non-portable. Patch

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 57cbeb5fa9b35618fb0e4e1490b76d40a55b0e36..64cef1643b165762ec704425ce264fe1b21b8d61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,33 @@
-##===- ./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 
+DIRS = lib/System lib/Support utils lib tools 
+
 
 ifneq ($(MAKECMDGOALS),tools-only)
 DIRS += runtime
-OPTIONAL_DIRS = projects
+OPTIONAL_DIRS = examples projects
 endif
 
+EXTRA_DIST := llvm.spec include configure \
+             autoconf/AutoRegen.sh autoconf/LICENSE.TXT autoconf/README.TXT \
+             autoconf/aclocal.m4 autoconf/config.guess autoconf/config.sub \
+             autoconf/configure.ac autoconf/depcomp autoconf/install-sh \
+             autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs \
+             autoconf/m4
 include $(LEVEL)/Makefile.common
 
+dist-hook::
+       @$(ECHO) Eliminating CVS directories from distribution
+       $(VERB) rm -rf `find $(TopDistDir) -type d -name CVS -print`
+
 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
-
-# Install support for llvm include files:
-.PHONY: install-includes
-
-install-includes:
-       $(MKDIR) $(DESTDIR)$(includedir)/llvm
-       cd include && find * '!' '(' -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 * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
-endif
-
-install:: install-includes
-
-# Build tags database for Emacs/Xemacs:
-.PHONY: tags
-
-TAGS: tags
-
-all:: tags
-
-tags:
-       $(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
-