From 85e6939883df4d5e3d414c4c5b2e81a92bf5f030 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 6 Aug 2010 12:36:02 +0000
Subject: xkbcomp: avoid needless recompilation when switching between debug
 and release wrong library name for freetype library

---
 xkbcomp/makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'xkbcomp')

diff --git a/xkbcomp/makefile b/xkbcomp/makefile
index 9f27c83d9..79dc293d2 100644
--- a/xkbcomp/makefile
+++ b/xkbcomp/makefile
@@ -23,6 +23,8 @@ endif
 
 DEFINES += DFLT_XKB_CONFIG_ROOT="\".\""
 
+INCLUDES += $(OBJDIR)
+
 CSRCS = action.c \
         alias.c \
         compat.c \
@@ -46,12 +48,12 @@ CSRCS = action.c \
 LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib
 
 ifeq ($(DEBUG),1)
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT_D.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT_D.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2d.lib
 else
-LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype214MT.lib \
+LINKLIBS += $(MHMAKECONF)\freetype\lib\freetype241MT.lib \
             $(MHMAKECONF)\pthreads\pthreadVC2.lib
 endif
 
-xkbparse.c xkbparse.h: xkbparse.y
-	bison -d -oxkbparse.c $<
+$(OBJDIR)\xkbparse.c $(OBJDIR)\xkbparse.h: xkbparse.y
+	bison -d -o$(OBJDIR)\xkbparse.c $<
-- 
cgit v1.2.3