X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=c412b2617907bc34483ee772f53290725d025e94;hb=bb4bdf4fe4c931e45d0a37e24ec79accd815c1d8;hp=4cbf53a8f07c9893d4745841299461e07856a2c0;hpb=59932233c60fb8df343377c236f72d06ae9e1876;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index 4cbf53a8f07..c412b261790 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
-##===- ./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 
-OPTIONAL_DIRS = projects
 
 ifneq ($(MAKECMDGOALS),tools-only)
 DIRS += runtime
+OPTIONAL_DIRS = examples projects
 endif
 
 include $(LEVEL)/Makefile.common
@@ -32,8 +32,11 @@ tools-only: all
 .PHONY: install-includes
 
 install-includes:
-	$(MKDIR) $(includedir)/llvm
-	cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+	$(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
 
@@ -42,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) -