diff options
| author | jkim <jkim@FreeBSD.org> | 2010-11-12 20:55:14 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-11-12 20:55:14 +0000 |
| commit | 72feb3913ec09b0f61b90759628f79e92b2ea450 (patch) | |
| tree | 4f33c44dc55bbc3996ed2121f95ae8596cc707de /sys/modules/acpi | |
| parent | 48df378ef02b15bdfd95a140fae980fd92745a0c (diff) | |
| download | FreeBSD-src-72feb3913ec09b0f61b90759628f79e92b2ea450.zip FreeBSD-src-72feb3913ec09b0f61b90759628f79e92b2ea450.tar.gz | |
MFamd64: (based on) r209957
Move logic of building ACPI headers for acpi_wakeup.c into better places,
remove intermediate makefile and shell script, and reduce diff between i386
and amd64.
Diffstat (limited to 'sys/modules/acpi')
| -rw-r--r-- | sys/modules/acpi/acpi/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index ce1e572..9953e0c 100644 --- a/sys/modules/acpi/acpi/Makefile +++ b/sys/modules/acpi/acpi/Makefile @@ -96,23 +96,24 @@ opt_ddb.h: Makefile .endif # Machine-specific code such as sleep/wakeup -SRCS+= acpi_apm.c acpi_machdep.c acpi_wakecode.h acpi_wakeup.c +SRCS+= acpi_apm.c acpi_machdep.c acpi_wakecode.h acpi_wakedata.h acpi_wakeup.c SRCS+= assym.s madt.c -CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o +CLEANFILES+=acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o acpi_wakedata.h SRCS+= opt_global.h +ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} +NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} +NM?= nm + .if ${MACHINE_CPUARCH} == "amd64" .if !defined(KERNBUILDDIR) CFLAGS+=-DSMP .endif -SRCS+= acpi_switch.S acpi_wakedata.h -CLEANFILES+= acpi_wakedata.h -ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} -NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} -NM?= nm +SRCS+= acpi_switch.S acpi_switch.o: acpi_switch.S ${NORMAL_S} +.endif acpi_wakecode.o: acpi_wakecode.S assym.s ${NORMAL_S} acpi_wakecode.bin: acpi_wakecode.o @@ -125,10 +126,5 @@ acpi_wakedata.h: acpi_wakecode.o while read offset dummy what; do \ echo "#define $${what} 0x$${offset}"; \ done > ${.TARGET} -.else -acpi_wakecode.h: acpi_wakecode.S assym.s - ${MAKE} -f ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica/Makefile \ - MAKESRCPATH=${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica -.endif .include <bsd.kmod.mk> |
