Update per new Makefile requirements for projects

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

diff --git a/projects/Stacker/Makefile.common.in b/projects/Stacker/Makefile.common.in
index 55a4f984cff01964b4ed4ffe9289783c572ca549..6620f5b4d86e5d79e501e63afd10f6d10c96e188 100644 (file)
--- a/projects/Stacker/Makefile.common.in
+++ b/projects/Stacker/Makefile.common.in
@@ -1,28 +1,21 @@
-#
+# Set the name of the project here
+PROJECT_NAME := Stacker
+
 # Set this variable to the top of the LLVM source tree.
-#
 LLVM_SRC_ROOT = @LLVM_SRC@
 
-#
 # Set this variable to the top level directory where LLVM was built
 # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
-#
 LLVM_OBJ_ROOT = @LLVM_OBJ@
 
-#
-# Include LLVM's Master Makefile.
-#
-include $(LLVM_OBJ_ROOT)/Makefile.config
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
 
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@)
 
-BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
 
-#
 # Include LLVM's Master Makefile.
-#
-include $(LLVM_SRC_ROOT)/Makefile.rules
-
+include $(LLVM_OBJ_ROOT)/Makefile.common

diff --git a/projects/sample/Makefile.common.in b/projects/sample/Makefile.common.in
index 55a4f984cff01964b4ed4ffe9289783c572ca549..2b3025bd011e033776458b8f66ac724625f3268b 100644 (file)
--- a/projects/sample/Makefile.common.in
+++ b/projects/sample/Makefile.common.in
@@ -1,28 +1,22 @@
-#
+# Set the name of the project here
+PROJECT_NAME := sample
+PROJ_VERSION := 0.9
+ 
 # Set this variable to the top of the LLVM source tree.
-#
 LLVM_SRC_ROOT = @LLVM_SRC@
 
-#
 # Set this variable to the top level directory where LLVM was built
 # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
-#
 LLVM_OBJ_ROOT = @LLVM_OBJ@
 
-#
-# Include LLVM's Master Makefile.
-#
-include $(LLVM_OBJ_ROOT)/Makefile.config
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
 
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@)
 
-BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
 
-#
 # Include LLVM's Master Makefile.
-#
-include $(LLVM_SRC_ROOT)/Makefile.rules
-
+include $(LLVM_OBJ_ROOT)/Makefile.common