Remove conditionals from the makefiles.

diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/mesa/pipe/llvm/instructions.cpp
index 645ab9106f4c74747dc470cb8a64e0aaa611175a..b0aa0cc746ea9048715d61b41a6cefa08af8f697 100644 (file)
--- 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 b57a0f83665e08c0cad2d7a2a764975d3bb0f088..4611ac17664ab426dfc59dcdb26c2d012c457125 100644 (file)
--- 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 dca8b399585bd9710a23de31a7a51efbc57b38d7..ff62fcf3e49cbd1359b864676c929079eac23162 100644 (file)
--- 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 30d3c32b8360248f1f6a52daf3cd07ff9c9e65f6..e27f02a9bc9e633461cf98919c2b759c953fea01 100644 (file)
--- 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 \