From: Zack Rusin <zack@tungstengraphics.com>
Date: Mon, 29 Oct 2007 14:01:29 +0000 (-0400)
Subject: Remove conditionals from the makefiles.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a6a3d8cb755c36d4ae1dc4dbfb310f06862a37b4;p=mesa.git

Remove conditionals from the makefiles.
---

diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/mesa/pipe/llvm/instructions.cpp
index 645ab9106f4..b0aa0cc746e 100644
--- a/src/mesa/pipe/llvm/instructions.cpp
+++ b/src/mesa/pipe/llvm/instructions.cpp
@@ -29,6 +29,7 @@
   * Authors:
   *   Zack Rusin zack@tungstengraphics.com
   */
+#ifdef MESA_LLVM
 
 #include "instructions.h"
 
@@ -1165,3 +1166,4 @@ llvm::Function * Instructions::findFunction(int label)
    return func;
 }
 
+#endif //MESA_LLVM
diff --git a/src/mesa/pipe/llvm/llvmtgsi.cpp b/src/mesa/pipe/llvm/llvmtgsi.cpp
index b57a0f83665..4611ac17664 100644
--- a/src/mesa/pipe/llvm/llvmtgsi.cpp
+++ b/src/mesa/pipe/llvm/llvmtgsi.cpp
@@ -29,6 +29,7 @@
   * Authors:
   *   Zack Rusin zack@tungstengraphics.com
   */
+#ifdef MESA_LLVM
 
 #include "llvmtgsi.h"
 
@@ -67,8 +68,6 @@
 #include <fstream>
 #include <iostream>
 
-#ifdef MESA_LLVM
-
 struct gallivm_prog {
    llvm::Module *module;
    void *function;
diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/mesa/pipe/llvm/storage.cpp
index dca8b399585..ff62fcf3e49 100644
--- a/src/mesa/pipe/llvm/storage.cpp
+++ b/src/mesa/pipe/llvm/storage.cpp
@@ -29,6 +29,7 @@
   * Authors:
   *   Zack Rusin zack@tungstengraphics.com
   */
+#ifdef MESA_LLVM
 
 #include "storage.h"
 
@@ -391,3 +392,4 @@ void Storage::popTemps()
    m_temps = m_tempStack.top();
    m_tempStack.pop();
 }
+#endif //MESA_LLVM
diff --git a/src/mesa/sources b/src/mesa/sources
index 30d3c32b836..e27f02a9bc9 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -187,12 +187,10 @@ TGSIDECO_SOURCES = \
 	pipe/tgsi/deco/deco_caps.c
 
 
-ifeq ($(MESA_LLVM),1)
-  LLVMTGSI_SOURCES = \
+LLVMTGSI_SOURCES = \
 	pipe/llvm/llvmtgsi.cpp \
 	pipe/llvm/storage.cpp \
 	pipe/llvm/instructions.cpp
-endif
 
 STATECACHE_SOURCES = \
 	pipe/cso_cache/cso_hash.c \