This is a horrible hack to work around libstdc++ bugs :(

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 3c78ec3f92cae3d885669bf0b868e39d94c01357..cd7e52131dea47de28e56b8888b754e1a5f2ea77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,40 @@
-##===- ./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
+ifneq ($(MAKECMDGOALS),tools-only)
+DIRS += runtime
+OPTIONAL_DIRS = examples projects
+endif
 
-AUTOCONF = autoconf
-AUTOHEADER = autoheader
+EXTRA_DIST := test llvm.spec include
 
-configure: autoconf/configure.ac autoconf/aclocal.m4
-       cd autoconf && $(AUTOCONF) -o ../configure configure.ac
-
-include/Config/config.h.in: autoconf/configure.ac autoconf/aclocal.m4
-       $(AUTOHEADER) -I autoconf autoconf/configure.ac
+include $(LEVEL)/Makefile.common
 
+dist-hook::
+       $(Echo) Eliminating CVS directories from distribution
+       $(Verb) $(RM) -rf `find $(TopDistDir) -type d -name CVS -print`
+       $(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
+
+check :: 
+       cd test; $(MAKE) 
+
+tools-only: all
+
+check-dejagnu:
+       $(MAKE) -C test check-dejagnu TESTSUITE=$(TESTSUITE)