From f5c5da89592b60364c2fd19426b2d9a17bab0b44 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 23 Dec 2012 20:10:16 +0100
Subject: [PATCH] Fix build when HAVE_XML isn't defined.
---
Makefile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index dd13011b66..e3f5a21c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,12 @@ ifeq ($(HAVE_SDL), 1)
endif
ifeq ($(HAVE_OPENGL), 1)
- OBJ += gfx/gl.o gfx/gfx_context.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/math/matrix.o
+ OBJ += gfx/gl.o \
+ gfx/gfx_context.o \
+ gfx/fonts/gl_font.o \
+ gfx/fonts/gl_raster_font.o \
+ gfx/math/matrix.o \
+ gfx/state_tracker.o
ifeq ($(HAVE_KMS), 1)
OBJ += gfx/context/drm_egl_ctx.o
@@ -239,12 +244,6 @@ ifeq ($(HAVE_XML), 1)
DEFINES += $(XML_CFLAGS)
endif
-ifeq ($(HAVE_XML), 1)
- OBJ += gfx/state_tracker.o
-else ifeq ($(HAVE_CG), 1)
- OBJ += gfx/state_tracker.o
-endif
-
ifeq ($(HAVE_DYLIB), 1)
LIBS += $(DYLIB_LIB)
endif