Fix auto-reconfigure bug: make sure we actually reconfigure not just

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index c412b2617907bc34483ee772f53290725d025e94..c11e7946cd5b4fc3a388e10ff2e6f76c2fad20d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,46 +7,31 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/Support utils lib tools 
+DIRS = lib/System lib/Support utils lib tools 
+
 
 ifneq ($(MAKECMDGOALS),tools-only)
 DIRS += runtime
 OPTIONAL_DIRS = examples projects
 endif
 
+EXTRA_DIST := test llvm.spec include
+
 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
+
 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 * -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
-
-install:: install-includes
-
-# Build tags database for Emacs/Xemacs:
-.PHONY: tags
-
-TAGS: tags
-
-all::
-
-tags:
-       find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h' | $(ETAGS) $(ETAGSFLAGS) -
-