summaryrefslogtreecommitdiff
path: root/xserver/hw
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2008-02-13 21:33:30 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2008-02-13 21:33:30 +0000
commit00991cc58c8b1782daa95f757f62d29e91fa52b7 (patch)
tree34e65f618bcb29f2068b7990657669f7ae308498 /xserver/hw
parent6f3d9c541096fa4bc9c24cb431186a52a21e6ba5 (diff)
Correctly link ioperm_noop.c to the build on m68k. ok matthieu@
Diffstat (limited to 'xserver/hw')
-rw-r--r--xserver/hw/xfree86/os-support/bsd/Makefile.am3
-rw-r--r--xserver/hw/xfree86/os-support/bsd/Makefile.in6
2 files changed, 6 insertions, 3 deletions
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.am b/xserver/hw/xfree86/os-support/bsd/Makefile.am
index d1e6fc135..219cc08cc 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.am
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.am
@@ -43,7 +43,8 @@ ARCH_SOURCES = arm_video.c \
endif
if HP300_VIDEO
-ARCH_SOURCES = hp300_video.c
+ARCH_SOURCES = hp300_video.c \
+ $(srcdir)/../shared/ioperm_noop.c
endif
if HPPA_VIDEO
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in
index d16d46dda..0806296ff 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in
@@ -74,7 +74,8 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/libc_wrapper.c \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@am__objects_1 = hp300_video.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@am__objects_1 = hp300_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@ ioperm_noop.lo
@ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
@@ -656,7 +657,8 @@ RES_SOURCES = $(srcdir)/../shared/stdResource.c
@ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c \
@ARM_VIDEO_TRUE@ $(srcdir)/../shared/ioperm_noop.c
-@HP300_VIDEO_TRUE@ARCH_SOURCES = hp300_video.c
+@HP300_VIDEO_TRUE@ARCH_SOURCES = hp300_video.c \
+@HP300_VIDEO_TRUE@ $(srcdir)/../shared/ioperm_noop.c
@HPPA_VIDEO_TRUE@ARCH_SOURCES = hppa_video.c
@I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
@PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c \