Move include installation steps to better location, inside each include dir instead...

Also, don't set NO_INSTALL=1 for c-index-test.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102724 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index f7e9e85bce83d20d4f81099e25cbd9a0771e0cd8..39cf9c6f57a14f88a1ebeaa93ac82bba6470e4e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,30 +37,3 @@ cscope.files:
                            -or -name '*.h' > cscope.files
 
 .PHONY: test report clean cscope.files
-
-install-local::
-       $(Echo) Installing include files
-       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
-       $(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include" ; then \
-         cd $(PROJ_SRC_ROOT)/tools/clang/include && \
-         for  hdr in `find . -type f '!' '(' -name '*~' \
-             -o -name '.#*' -o -name '*.in' -o -name '*.txt' \
-             -o -name 'Makefile' -o -name '*.td' ')' -print \
-              | grep -v CVS | grep -v .svn | grep -v .dir` ; do \
-           instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
-           if test \! -d "$$instdir" ; then \
-             $(EchoCmd) Making install directory $$instdir ; \
-             $(MKDIR) $$instdir ;\
-           fi ; \
-           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
-         done ; \
-       fi
-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-       $(Verb) if test -d "$(PROJ_OBJ_ROOT)/tools/clang/include" ; then \
-         cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
-         for hdr in `find . -type f '!' '(' -name 'Makefile' ')' -print \
-            | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
-           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
-         done ; \
-       fi
-endif

diff --git a/include/Makefile b/include/Makefile
index 47daabc7fa69a2d44d167f215f02d61f01e82c0b..f686d6a6460684b2912e4bca32e5f4edb218d7c5 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
 LEVEL = ../../..
-DIRS := clang
+DIRS := clang clang-c
 
 include $(LEVEL)/Makefile.common

diff --git a/include/clang-c/Makefile b/include/clang-c/Makefile
new file mode 100644 (file)
index 0000000..5e3522f
--- /dev/null
+++ b/include/clang-c/Makefile
@@ -0,0 +1,31 @@
+LEVEL = ../../../..
+DIRS :=
+
+include $(LEVEL)/Makefile.common
+
+install-local::
+       $(Echo) Installing Clang C API include files
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
+       $(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include/clang-c" ; then \
+         cd $(PROJ_SRC_ROOT)/tools/clang/include && \
+         for  hdr in `find clang-c -type f '!' '(' -name '*~' \
+             -o -name '.#*' -o -name '*.in' -o -name '*.txt' \
+             -o -name 'Makefile' -o -name '*.td' ')' -print \
+              | grep -v CVS | grep -v .svn | grep -v .dir` ; do \
+           instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
+           if test \! -d "$$instdir" ; then \
+             $(EchoCmd) Making install directory $$instdir ; \
+             $(MKDIR) $$instdir ;\
+           fi ; \
+           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
+       $(Verb) if test -d "$(PROJ_OBJ_ROOT)/tools/clang/include/clang-c" ; then \
+         cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
+         for hdr in `find clang-c -type f '!' '(' -name 'Makefile' ')' -print \
+            | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+endif

diff --git a/include/clang/Makefile b/include/clang/Makefile
index 624292a128ee4b48f1b6e62cde5e829178da796b..d76e0a9c63ba545c3d52171b627c50ac8e1abe5c 100644 (file)
--- a/include/clang/Makefile
+++ b/include/clang/Makefile
@@ -2,3 +2,30 @@ LEVEL = ../../../..
 DIRS := Basic Driver
 
 include $(LEVEL)/Makefile.common
+
+install-local::
+       $(Echo) Installing Clang include files
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
+       $(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include/clang" ; then \
+         cd $(PROJ_SRC_ROOT)/tools/clang/include && \
+         for  hdr in `find clang -type f '!' '(' -name '*~' \
+             -o -name '.#*' -o -name '*.in' -o -name '*.txt' \
+             -o -name 'Makefile' -o -name '*.td' ')' -print \
+              | grep -v CVS | grep -v .svn | grep -v .dir` ; do \
+           instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
+           if test \! -d "$$instdir" ; then \
+             $(EchoCmd) Making install directory $$instdir ; \
+             $(MKDIR) $$instdir ;\
+           fi ; \
+           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
+       $(Verb) if test -d "$(PROJ_OBJ_ROOT)/tools/clang/include/clang" ; then \
+         cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
+         for hdr in `find clang -type f '!' '(' -name 'Makefile' ')' -print \
+            | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+           $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
+         done ; \
+       fi
+endif

diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index e9ba174275a4d5c595fb20bfe1a262fd42120c0b..141256361763147dc4a6484c6d5ca36b45881b31 100644 (file)
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -10,7 +10,6 @@ LEVEL = ../../../..
 
 TOOLNAME = c-index-test
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-NO_INSTALL = 1
 
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1