Author: marcel
Date: Wed Apr 18 17:44:05 2012
New Revision: 234427
URL: http://svn.freebsd.org/changeset/base/234427

Log:
  Compensate for the replacement of uart_cpu_{amd64|i386}.c with
  uart_cpu_x86.c
  
  Pointy hat: marcel

Modified:
  head/sys/modules/uart/Makefile

Modified: head/sys/modules/uart/Makefile
==============================================================================
--- head/sys/modules/uart/Makefile      Wed Apr 18 17:12:04 2012        
(r234426)
+++ head/sys/modules/uart/Makefile      Wed Apr 18 17:44:05 2012        
(r234427)
@@ -7,16 +7,23 @@ uart_bus_ebus=        uart_bus_ebus.c
 ofw_bus_if=    ofw_bus_if.h
 .endif
 
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
+_uart_cpu=uart_cpu_x86.c
+.else
+_uart_cpu=uart_cpu_${MACHINE}.c
+.endif
+.if exists(${.CURDIR:H:H}/dev/uart/${_uart_cpu})
+uart_cpu_machine= ${_uart_cpu}
+.endif
+
 KMOD=  uart
 SRCS=  uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
        uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
-       uart_core.c uart_dbg.c \
+       uart_core.c ${uart_cpu_machine} uart_dbg.c \
        uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \
        uart_dev_z8530.c \
        uart_if.c uart_if.h uart_subr.c uart_tty.c
-.if exists(${.CURDIR}/../../dev/uart/uart_cpu_${MACHINE}.c)
-SRCS+= uart_cpu_${MACHINE}.c
-.endif
+
 SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
        power_if.h pccarddevs.h serdev_if.h
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to