Clean up ACPI build wrappers:
authorYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Wed, 14 Jun 2006 15:50:09 +0000 (15:50 +0000)
committerYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Wed, 14 Jun 2006 15:50:09 +0000 (15:50 +0000)
* move .PATH directive out of acpi.mk and make it variables
  ACPICA_KERN_PATHS and ACPICA_UTIL_PATHS.  The latter
  contains a few extra paths to compile ACPI tools.
* subdirectories in ACPI-CA tree have been renamed to use only
  lower case letters for more than a year, trim upper case
  ones from the paths.

sys/conf/acpi.mk
sys/dev/acpica5/Makefile
sys/dev/acpica5/acpi_toshiba/Makefile
usr.sbin/acpi/Makefile.inc

index 7bf1d88..73a75ad 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/sys/conf/acpi.mk,v 1.1 2005/08/16 10:31:35 y0netan1 Exp $
+# $DragonFly: src/sys/conf/acpi.mk,v 1.2 2006/06/14 15:50:09 y0netan1 Exp $
 #
 
 ACPICA_VERSION=                20050309
@@ -10,7 +10,8 @@ OSACPI_MD_DIR?=               ${MACHINE_ARCH}/acpica5
 SYSDIR=        $S
 .endif
 
-.PATH: ${SYSDIR}/${ACPICA_DIR}/interpreter/dispatcher  \
+ACPICA_KERN_PATHS = \
+       ${SYSDIR}/${ACPICA_DIR}/interpreter/dispatcher  \
        ${SYSDIR}/${ACPICA_DIR}/interpreter/executer    \
        ${SYSDIR}/${ACPICA_DIR}/interpreter/parser      \
        ${SYSDIR}/${ACPICA_DIR}/events                  \
@@ -20,16 +21,13 @@ SYSDIR=     $S
        ${SYSDIR}/${ACPICA_DIR}/tables                  \
        ${SYSDIR}/${ACPICA_DIR}/utilities               \
        ${SYSDIR}/${ACPICA_DIR}/debugger                \
-       ${SYSDIR}/${ACPICA_DIR}/disassembler            \
-       ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/DISPATCHER  \
-       ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/EXECUTER    \
-       ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/PARSER      \
-       ${SYSDIR}/${ACPICA_DIR}/EVENTS                  \
-       ${SYSDIR}/${ACPICA_DIR}/HARDWARE                \
-       ${SYSDIR}/${ACPICA_DIR}/NAMESPACE               \
-       ${SYSDIR}/${ACPICA_DIR}/RESOURCES               \
-       ${SYSDIR}/${ACPICA_DIR}/TABLES                  \
-       ${SYSDIR}/${ACPICA_DIR}/UTILITIES
+       ${SYSDIR}/${ACPICA_DIR}/disassembler
+
+ACPICA_UTIL_PATHS = \
+       ${ACPICA_KERN_PATHS}                            \
+       ${SYSDIR}/${ACPICA_DIR}                         \
+       ${SYSDIR}/${ACPICA_DIR}/compiler                \
+       ${SYSDIR}/${ACPICA_DIR}/common
 
 ${.OBJDIR}/acpi.h: ${SYSDIR}/${ACPICA_DIR}/include/acpi.h
        cp ${.ALLSRC} ${.TARGET}
index ca8f04e..c377309 100644 (file)
@@ -1,15 +1,15 @@
 # $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.3 2004/01/08 16:38:32 njl Exp $
-# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.10 2006/05/11 08:23:19 swildner Exp $
-
-.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/acpica5        \
-       ${.CURDIR}/../../${MACHINE_ARCH}/isa            \
-       ${.CURDIR}/../../bus/pci                        \
-       ${.CURDIR}/Osd                                  \
-       ${.CURDIR}
+# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.11 2006/06/14 15:50:09 y0netan1 Exp $
 
 SYSDIR?= ${.CURDIR}/../..
 .include "Makefile.inc"
 
+.PATH: ${SYSDIR}/${OSACPI_MD_DIR}                      \
+       ${SYSDIR}/${MACHINE_ARCH}/isa                   \
+       ${SYSDIR}/bus/pci                               \
+       ${.CURDIR}/Osd                                  \
+       ${.CURDIR}                                      \
+       ${ACPICA_KERN_PATHS}
 
 KMOD   = acpi
 
@@ -83,8 +83,8 @@ CLEANFILES+=  acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin ${DBSRC}
 CLEANFILES+=   platform/acenv.h
 
 acpi_wakecode.h: acpi_wakecode.S
-       ${MAKE} -f ${.CURDIR}/../../${MACHINE_ARCH}/acpica5/Makefile \
-               MAKESRCPATH=${.CURDIR}/../../${MACHINE_ARCH}/acpica5
+       ${MAKE} -f ${SYSDIR}/${OSACPI_MD_DIR}/Makefile \
+               MAKESRCPATH=${SYSDIR}/${OSACPI_MD_DIR}
 
 SUBDIR=        acpi_toshiba
 all: ${PROG} ${SUBDIR}
index 0138e3f..a0be534 100644 (file)
@@ -1,12 +1,11 @@
 # $FreeBSD: src/sys/modules/acpi/acpi_toshiba/Makefile,v 1.1 2004/01/11 19:18:38 njl Exp $
-# $DragonFly: src/sys/dev/acpica5/acpi_toshiba/Makefile,v 1.2 2005/03/11 18:27:49 y0netan1 Exp $
+# $DragonFly: src/sys/dev/acpica5/acpi_toshiba/Makefile,v 1.3 2006/06/14 15:50:09 y0netan1 Exp $
 
 SYSDIR?=${.CURDIR}/../../..
-.PATH:         ${.CURDIR}/../../../${MACHINE_ARCH}/acpica5
 
 KMOD=          acpi_toshiba
-CFLAGS+=       -I${.OBJDIR} -I${.OBJDIR}/.. -I${.CURDIR}/.. \
-               -I${.CURDIR}/../../../${SYSACPICA}/include
+CFLAGS+=       -I${.OBJDIR}/.. -I${.CURDIR}/..
 SRCS=          acpi_toshiba.c opt_acpi.h device_if.h bus_if.h
 
 .include <bsd.kmod.mk>
+.PATH:         ${SYSDIR}/${OSACPI_MD_DIR}
index d2f7695..4f4ff9b 100644 (file)
@@ -1,14 +1,12 @@
 # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
 # $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.8 2003/08/07 16:51:50 njl Exp $
-# $DragonFly: src/usr.sbin/acpi/Makefile.inc,v 1.3 2005/08/16 10:31:35 y0netan1 Exp $
+# $DragonFly: src/usr.sbin/acpi/Makefile.inc,v 1.4 2006/06/14 15:50:09 y0netan1 Exp $
 
 SYSDIR?= ${.CURDIR}/../../../sys
 .include "${SYSDIR}/conf/acpi.mk"
 
 .PATH:         ${.OBJDIR}                              \
-               ${SYSDIR}/${ACPICA_DIR}                 \
-               ${SYSDIR}/${ACPICA_DIR}/compiler        \
-               ${SYSDIR}/${ACPICA_DIR}/common
+               ${ACPICA_UTIL_PATHS}
 
 CFLAGS+=       -I${.OBJDIR}                            \
                -I${SYSDIR}/${OSACPI_MI_DIR}            \