[llvm-commits] CVS: llvm-java/Makefile Makefile.common.in

[Alkis Evlogimenos]

Changes in directory llvm-java:

Makefile updated: 1.3 -> 1.4
Makefile.common.in updated: 1.6 -> 1.7
---
Log message:

Update per new Makefile requirements for projects

---
Diffs of the changes:  (+14 -23)

Index: llvm-java/Makefile
diff -u llvm-java/Makefile:1.3 llvm-java/Makefile:1.4
--- llvm-java/Makefile:1.3	Sat Jul 24 06:53:22 2004
+++ llvm-java/Makefile	Sat Jan 15 20:21:42 2005
@@ -9,5 +9,6 @@
 LEVEL := .
 
 DIRS := lib tools runtime
+EXTRA_DIST := Makefile.test
 
 include $(LEVEL)/Makefile.common


Index: llvm-java/Makefile.common.in
diff -u llvm-java/Makefile.common.in:1.6 llvm-java/Makefile.common.in:1.7
--- llvm-java/Makefile.common.in:1.6	Wed Dec  8 00:37:37 2004
+++ llvm-java/Makefile.common.in	Sat Jan 15 20:21:42 2005
@@ -1,48 +1,38 @@
-#===-- Makefile.common - Common make rules for LLVM -------*- makefile -*--====
+#===-- Makefile.common - Common make rules for LLVM -------*- 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.
 #
-##===----------------------------------------------------------------------===#
+#===-------------------------------------------------------------------------===
+
+PROJECT_NAME = @PACKAGE_NAME@
+PROJ_VERSION = @PACKAGE_VERSION@
 
-#
 # 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 //,/, at abs_top_srcdir@)
 
-#
-# Set the source root and source directory pathnames
-#
-BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
 
-BUILD_SRC_ROOT := $(subst //,/, at 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
 
-#
 # Additional utilities
-#
 JAVA=@JAVA@
 JAVAC=@JAVAC@
 JAVAH=@JAVAH@
 
-#
 # Include local build rules.
-#
-include $(BUILD_SRC_ROOT)/Makefile.rules
+include $(PROJ_SRC_ROOT)/Makefile.rules