From 22978217af9f58f6eb51cb3529be838b586e75c3 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sun, 16 Jan 2005 02:21:42 +0000
Subject: [PATCH] Update per new Makefile requirements for projects

llvm-svn: 19594
---
 llvm/projects/Stacker/Makefile.common.in | 33 +++++++++--------------
 llvm/projects/sample/Makefile.common.in  | 34 ++++++++++--------------
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/llvm/projects/Stacker/Makefile.common.in b/llvm/projects/Stacker/Makefile.common.in
index 55a4f984cff0..6620f5b4d86e 100644
--- a/llvm/projects/Stacker/Makefile.common.in
+++ b/llvm/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@
 
-#
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
+
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@)
+
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
+
 # Include LLVM's Master Makefile.
-#
-include $(LLVM_OBJ_ROOT)/Makefile.config
-
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
-
-BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
-
-#
-# Include LLVM's Master Makefile.
-#
-include $(LLVM_SRC_ROOT)/Makefile.rules
-
+include $(LLVM_OBJ_ROOT)/Makefile.common
diff --git a/llvm/projects/sample/Makefile.common.in b/llvm/projects/sample/Makefile.common.in
index 55a4f984cff0..2b3025bd011e 100644
--- a/llvm/projects/sample/Makefile.common.in
+++ b/llvm/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@
 
-#
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
+
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@)
+
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
+
 # Include LLVM's Master Makefile.
-#
-include $(LLVM_OBJ_ROOT)/Makefile.config
-
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
-
-BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
-
-#
-# Include LLVM's Master Makefile.
-#
-include $(LLVM_SRC_ROOT)/Makefile.rules
-
+include $(LLVM_OBJ_ROOT)/Makefile.common