Check for __MINGW define instead of __MINGW_H, patch by Henrik Bach.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index a9a59de8c1ab8120c17b953c6d4e62f0209e6528..ae3ffa2a52e2abc02974645614000ae2301f9da5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 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
 
 include $(LEVEL)/Makefile.common
@@ -21,7 +21,7 @@ test :: all
 
 distclean:: clean
        $(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
-                         $(LEVEL)/include/Config/config.h \
+                         $(LEVEL)/include/llvm/Config/config.h \
                          $(LEVEL)/autoconf/autom4te.cache \
                          $(LEVEL)/config.log \
                          $(LEVEL)/TAGS
@@ -33,9 +33,9 @@ tools-only: all
 
 install-includes:
        $(MKDIR) $(DESTDIR)$(includedir)/llvm
-       cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(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 * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+       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
@@ -45,8 +45,8 @@ install:: install-includes
 
 TAGS: tags
 
-all:: tags
+all::
 
 tags:
-       $(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
+       find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h' | $(ETAGS) $(ETAGSFLAGS) -