Fix usage of parenthesis in Makefiles

While BSD make support both $() and ${} around variables, the NetBSD
source tree uses only ${} by convention.

Imported software is left as is, and sometimes $() is used when the
containing Makefile/Makefile fragment is used both by GNU make and BSD
make, as it can happen for the tools, and other parts as well which are
compiled using the host make tool.

Change-Id: Ic7d480812fde53e7e3e95275a30a3b720c95cc15
This commit is contained in:
Lionel Sambuc 2016-02-06 12:38:52 +01:00
parent 59ca1d7542
commit 86b583c518
25 changed files with 47 additions and 47 deletions

View File

@ -2,8 +2,8 @@
PROG= es1370 PROG= es1370
SRCS= es1370.c ak4531.c pci_helper.c SRCS= es1370.c ak4531.c pci_helper.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= es1371 PROG= es1371
SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c SRCS= es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}

View File

@ -6,6 +6,6 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH}
SRCS += omap_i2c.c omap_i2c.h omap_i2c_registers.h SRCS += omap_i2c.c omap_i2c.h omap_i2c_registers.h
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d

View File

@ -2,8 +2,8 @@
PROG= ti1225 PROG= ti1225
SRCS= ti1225.c SRCS= ti1225.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSYS} DPADD+= ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= amddev PROG= amddev
SRCS= amddev.c SRCS= amddev.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSYS} DPADD+= ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= 3c90x PROG= 3c90x
SRCS= 3c90x.c SRCS= 3c90x.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= atl2 PROG= atl2
SRCS= atl2.c SRCS= atl2.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= dec21140A PROG= dec21140A
SRCS= dec21140A.c SRCS= dec21140A.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= dpeth PROG= dpeth
SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c SRCS= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= e1000 PROG= e1000
SRCS= e1000.c SRCS= e1000.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= fxp PROG= fxp
SRCS= fxp.c mii.c SRCS= fxp.c mii.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= lan8710a PROG= lan8710a
SRCS= lan8710a.c SRCS= lan8710a.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= lance PROG= lance
SRCS= lance.c SRCS= lance.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= rtl8139 PROG= rtl8139
SRCS= rtl8139.c SRCS= rtl8139.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= rtl8169 PROG= rtl8169
SRCS= rtl8169.c SRCS= rtl8169.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} DPADD+= ${LIBNETDRIVER} ${LIBSYS}

View File

@ -2,8 +2,8 @@
PROG= virtio_net PROG= virtio_net
SRCS= virtio_net.c SRCS= virtio_net.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBVIRTIO} DPADD+= ${LIBNETDRIVER} ${LIBSYS} ${LIBVIRTIO}

View File

@ -2,8 +2,8 @@
PROG= random PROG= random
SRCS= main.c random.c rijndael_api.c rijndael_alg.c SRCS= main.c random.c rijndael_api.c rijndael_alg.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/aes .PATH: ${.CURDIR}/aes

View File

@ -2,8 +2,8 @@
PROG=usb_hub PROG=usb_hub
SRCS=usb_hub.c urb_helper.c SRCS=usb_hub.c urb_helper.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR=/etc/system.conf.d FILESDIR=/etc/system.conf.d
DPADD+=${LIBDDEKIT_USB_CLIENT} ${LIBDDEKIT} ${LIBUSB} ${LIBSYS} ${LIBMINLIB} DPADD+=${LIBDDEKIT_USB_CLIENT} ${LIBDDEKIT} ${LIBUSB} ${LIBSYS} ${LIBMINLIB}

View File

@ -2,8 +2,8 @@
PROG= usb_storage PROG= usb_storage
SRCS= urb_helper.c bulk.c scsi.c usb_storage.c SRCS= urb_helper.c bulk.c scsi.c usb_storage.c
FILES= $(PROG).conf FILES= ${PROG}.conf
FILESNAME= $(PROG) FILESNAME= ${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBBLOCKDRIVER} ${LIBDDEKIT_USB_CLIENT} ${LIBSYS} ${LIBDDEKIT} ${LIBUSB} DPADD+= ${LIBBLOCKDRIVER} ${LIBDDEKIT_USB_CLIENT} ${LIBSYS} ${LIBDDEKIT} ${LIBUSB}

View File

@ -3,8 +3,8 @@ PROG= vbfs
SRCS= vbfs.c SRCS= vbfs.c
MAN= vbfs.8 MAN= vbfs.8
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS} DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS}

View File

@ -2,7 +2,7 @@ LIB= ddekit_usb_client
SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src
VPATH = $(SRC_DIR) VPATH = ${SRC_DIR}
SRCS = usb_client.c SRCS = usb_client.c

View File

@ -2,7 +2,7 @@ LIB= ddekit_usb_server
SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src
VPATH = $(SRC_DIR) VPATH = ${SRC_DIR}
SRCS = usb_server.c SRCS = usb_server.c

View File

@ -11,8 +11,8 @@ SRCS= buf.c clock.c inet.c inet_config.c \
queryparam.c version.c queryparam.c version.c
MAN= inet.8 MAN= inet.8
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/generic .PATH: ${.CURDIR}/generic

View File

@ -10,8 +10,8 @@ SRCS= lwip.c \
inet_config.c \ inet_config.c \
eth.c eth.c
FILES=$(PROG).conf FILES=${PROG}.conf
FILESNAME=$(PROG) FILESNAME=${PROG}
FILESDIR= /etc/system.conf.d FILESDIR= /etc/system.conf.d
.PATH: ${.CURDIR}/generic .PATH: ${.CURDIR}/generic

View File

@ -103,7 +103,7 @@ common.o: common.c
PROGS+= test63 mod PROGS+= test63 mod
.endif # ${MKPIC} == "yes" .endif # ${MKPIC} == "yes"
.for o in $(PROGS) .for o in ${PROGS}
OBJS.${o} += common.o OBJS.${o} += common.o
.endfor .endfor