Remove conditionals from the makefiles.

diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/mesa/pipe/llvm/instructions.cpp
index 645ab91..b0aa0cc 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 b57a0f8..4611ac1 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 dca8b39..ff62fcf 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 30d3c32..e27f02a 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 \