Remove conditionals from the makefiles.

3 files changed, 5 insertions, 2 deletions

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 [email protected]
   */
+#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 [email protected]
   */
+#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 [email protected]
   */
+#ifdef MESA_LLVM
 
 #include "storage.h"
 
@@ -391,3 +392,4 @@ void Storage::popTemps()
    m_temps = m_tempStack.top();
    m_tempStack.pop();
 }
+#endif //MESA_LLVM