8 files changed, 23 insertions, 16 deletions
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile
index 6ca80fdc7..7aea53a37 100644
--- a/lib/libGL/Makefile
+++ b/lib/libGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2013/11/24 06:23:35 jsg Exp $
+# $OpenBSD: Makefile,v 1.41 2014/01/11 12:39:14 miod Exp $
 .include <bsd.xconf.mk>
 
 .if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm"
@@ -154,7 +154,8 @@ obj: _xenocara_obj
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG = -fPIC
 .endif
 
diff --git a/lib/libGL/dri/swrast/Makefile b/lib/libGL/dri/swrast/Makefile
index a0a1d94cd..ddf431fbd 100644
--- a/lib/libGL/dri/swrast/Makefile
+++ b/lib/libGL/dri/swrast/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.5 2013/09/05 15:11:58 jsg Exp $
+#	$OpenBSD: Makefile,v 1.6 2014/01/11 12:39:14 miod Exp $
 
 LIB=	swrast_dri.so
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc"
 PICFLAG = -fPIC
 .endif
 
diff --git a/lib/libGL/gallium/Makefile.inc b/lib/libGL/gallium/Makefile.inc
index b9fc516f5..067a63fc4 100644
--- a/lib/libGL/gallium/Makefile.inc
+++ b/lib/libGL/gallium/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2013/09/05 15:11:59 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2014/01/11 12:39:14 miod Exp $
 .include <bsd.xconf.mk>
 
 CPP=	cpp -notraditional
@@ -60,6 +60,7 @@ LOCALBASE?=	/usr/local
 LDADD+=		${LOCALBASE}/lib/libelf.a
 .endif
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG=-fPIC
 .endif
diff --git a/lib/libGL/glsl/libglsl/Makefile b/lib/libGL/glsl/libglsl/Makefile
index 44b2b3385..0a58c183c 100644
--- a/lib/libGL/glsl/libglsl/Makefile
+++ b/lib/libGL/glsl/libglsl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/09/05 15:12:08 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2014/01/11 12:39:14 miod Exp $
 .include <bsd.xconf.mk>
 
 MESA=	${.CURDIR}/../../../../dist/Mesa/src/mesa
@@ -181,6 +181,7 @@ ${LIB}_pic.a:	${OBJS} $(DPADD)
 .PATH: ${.CURDIR}/../../generated/glsl
 .PATH: ${.CURDIR}/../../generated/glsl/glcpp
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG=-fPIC
 .endif
diff --git a/lib/libGL/mesa/Makefile.inc b/lib/libGL/mesa/Makefile.inc
index 0b6e15c3a..77eadf8aa 100644
--- a/lib/libGL/mesa/Makefile.inc
+++ b/lib/libGL/mesa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2013/11/24 06:23:35 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2014/01/11 12:39:14 miod Exp $
 
 MESA=		${.CURDIR}/../../../../dist/Mesa/src/mesa
 MAPI=		${.CURDIR}/../../../../dist/Mesa/src/mapi
@@ -522,6 +522,7 @@ x86_xform4.so: matypes.h
 .PATH: ${.CURDIR}/../../generated/main
 .PATH: ${.CURDIR}/../../generated/program
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG=-fPIC
 .endif
diff --git a/lib/libGLESv1_CM/Makefile b/lib/libGLESv1_CM/Makefile
index c0f281916..dbb465c31 100644
--- a/lib/libGLESv1_CM/Makefile
+++ b/lib/libGLESv1_CM/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/11/24 06:23:35 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2014/01/11 12:39:14 miod Exp $
 .include <bsd.xconf.mk>
 
 LIB=	GLESv1_CM
@@ -83,7 +83,8 @@ obj: _xenocara_obj
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG = -fPIC
 .endif
 
diff --git a/lib/libGLESv2/Makefile b/lib/libGLESv2/Makefile
index 6f6b7b419..50b94f757 100644
--- a/lib/libGLESv2/Makefile
+++ b/lib/libGLESv2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/11/24 06:23:35 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2014/01/11 12:39:14 miod Exp $
 .include <bsd.xconf.mk>
 
 LIB=	GLESv2
@@ -94,7 +94,8 @@ obj: _xenocara_obj
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG = -fPIC
 .endif
 
diff --git a/lib/libglapi/Makefile b/lib/libglapi/Makefile
index 0869f885d..9dcafec77 100644
--- a/lib/libglapi/Makefile
+++ b/lib/libglapi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/09/05 15:11:56 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2014/01/11 12:39:15 miod Exp $
 .include <bsd.xconf.mk>
 
 LIB=	glapi
@@ -76,7 +76,8 @@ obj: _xenocara_obj
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
 
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc"
 PICFLAG = -fPIC
 .endif
 .PATH: ${MESA}/main