[vmkit-commits] [vmkit] r180409 - cleanify Makefile.common.in

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:07:09 2013
New Revision: 180409

URL: http://llvm.org/viewvc/llvm-project?rev=180409&view=rev
Log:
cleanify Makefile.common.in
(cherry picked from commit 59cc4b1981a1b2ef301bfc337e1003cf1d51d242)

Modified:
    vmkit/trunk/Makefile.common.in

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=180409&r1=180408&r2=180409&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Apr 25 12:07:09 2013
@@ -1,23 +1,13 @@
-# Set the name of the project here
 PROJECT_NAME := @PACKAGE_NAME@
 PROJ_VERSION := @PACKAGE_VERSION@
 
 realpath=$(shell cd $(1); $(PWD))
 
-# Set the directory root of this project's source files
 PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
-VMKIT_SRC_ROOT := $(PROJ_SRC_ROOT)
-
-# Set the root directory of this project's object files
 PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
-VMKIT_OBJ_ROOT := $(PROJ_OBJ_ROOT)
-
 PROJ_OBJ_CWD:= $(call realpath, .)
 PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
 
-# Set the root directory of this project's install prefix
-PROJ_INSTALL_ROOT := @prefix@
-
 MMTK_PLAN = @MMTK_PLAN@
 MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
 WITH_64 = @WITH_64@
@@ -48,33 +38,10 @@ OPTIMIZED=@OPTIMIZED@
 DEBUG=@DEBUG@
 ASSERT=@ASSERT@
 
- # 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@
-
-# Define BYTECODE_LIBRARY before including LLVM's Makefile.common to get
-# dependencies right.
-BYTECODE_LIBRARY = 1
-LLVMCC_OPTION = "clang"
-ENABLE_BUILT_CLANG = 1
-LLVMCC_EMITIR_FLAG = "-emit-llvm"
-
-ifeq ($(BUILD_FRAMETABLE), 1)
-  BUILT_SOURCES = FrametablesSymbols.inc FrametablesExterns.inc
-endif
-
-REQUIRES_FRAME_POINTER	:= 1
 JAVAC_TARGET		:= 1.5
 
 ENABLE_OPTIMIZED=1
 
-CXX.Flags += @GC_FLAGS@ -fno-exceptions -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -fno-rtti
-
-# GNU Classpath flags
-CLASSPATH_FLAGS =
 GLIBJ = @classpathglibj@
 
 # Using conditional compilation for now, until a proper interface/architecture
@@ -83,8 +50,8 @@ ifeq (@classpathimpl@,openjdk)
 COMMON_CFLAGS+=-DUSE_OPENJDK
 endif
 
-LIBS += -lz
-
+CONFIG_FILES=@ac_config_files@
+CONFIG_HEADERS=@ac_config_headers@
 
 ifeq ($(ENABLE_OPTIMIZED),1)
 	LLC_CPP_FLAGS		:=
@@ -114,7 +81,4 @@ else
 	PRECOMPILER_FLAGS	:=
 endif
 
-CONFIG_FILES=@ac_config_files@
-CONFIG_HEADERS=@ac_config_headers@
-
 include $(PROJ_SRC_ROOT)/Makefile.rules