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

[John Criswell]

Changes in directory llvm-java:

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

Completely changed Makefile.common.in, basing it off of the LLVM sample
project.
I also re-added all of Alkis's changes (or, at least, I hope I did).
This should get the llvm-java build working as a standard LLVM project,
enabling building in both srcdir and with a separate objdir.


---
Diffs of the changes:  (+21 -15)

Index: llvm-java/Makefile.common.in
diff -u llvm-java/Makefile.common.in:1.3 llvm-java/Makefile.common.in:1.4
--- llvm-java/Makefile.common.in:1.3	Sat May 22 01:21:36 2004
+++ llvm-java/Makefile.common.in	Thu Sep 16 09:13:18 2004
@@ -6,38 +6,44 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===#
+
 #
-# Configure the location of the LLVM object root.  We know it is two
-# directories up.  The source tree location we do not know; let the LLVM
-# Makefiles find it for us.
+# Set this variable to the top of the LLVM source tree.
 #
-LLVM_OBJ_ROOT=$(LEVEL)/../..
+LLVM_SRC_ROOT = @LLVM_SRC@
 
 #
-# Grab the LLVM configuration file.
+# 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).
 #
-include $(LEVEL)/../../Makefile.config
+LLVM_OBJ_ROOT = @LLVM_OBJ@
 
 #
-# Reconfigure the source directories
+# Include LLVM's Master Makefile.
 #
-BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/Java
-BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%, $(BUILD_OBJ_DIR)))
+include $(LLVM_OBJ_ROOT)/Makefile.config
 
 #
-# Additional utilities
+# Set the source root and source directory pathnames
 #
-JIKES=@JIKES@
-JAVAC=@JAVAC@
-JAVA=@JAVA@
+BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
 
 #
-# Include LLVM's build rules.
+# Include LLVM's Master Makefile.
 #
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 #
+# Additional utilities
+#
+JIKES=@JIKES@
+JAVAC=@JAVAC@
+JAVA=@JAVA@
+
+#
 # Include local build rules.
 #
-include $(LEVEL)/Makefile.rules
+include $(BUILD_SRC_ROOT)/Makefile.rules