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
2016-02-06 12:38:52 +01:00 · 2016-02-06 12:38:52 +01:00 · 86b583c518
commit 86b583c518
parent 59ca1d7542
25 changed files with 47 additions and 47 deletions
--- a/minix/drivers/audio/es1370/Makefile
+++ b/minix/drivers/audio/es1370/Makefile
@ -2,8 +2,8 @@
 PROG=	es1370
 SRCS=	es1370.c ak4531.c pci_helper.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
--- a/minix/drivers/audio/es1371/Makefile
+++ b/minix/drivers/audio/es1371/Makefile
@ -2,8 +2,8 @@
 PROG=	es1371
 SRCS=	es1371.c AC97.c pci_helper.c wait.c sample_rate_converter.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
--- a/minix/drivers/bus/i2c/arch/earm/Makefile.inc
+++ b/minix/drivers/bus/i2c/arch/earm/Makefile.inc
@ -6,6 +6,6 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH}

 SRCS += omap_i2c.c omap_i2c.h omap_i2c_registers.h

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d
--- a/minix/drivers/bus/ti1225/Makefile
+++ b/minix/drivers/bus/ti1225/Makefile
@ -2,8 +2,8 @@
 PROG=	ti1225
 SRCS=	ti1225.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBSYS}
--- a/minix/drivers/iommu/amddev/Makefile
+++ b/minix/drivers/iommu/amddev/Makefile
@ -2,8 +2,8 @@
 PROG=	amddev
 SRCS=	amddev.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+= ${LIBSYS}
--- a/minix/drivers/net/3c90x/Makefile
+++ b/minix/drivers/net/3c90x/Makefile
@ -2,8 +2,8 @@
 PROG=	3c90x
 SRCS=	3c90x.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/atl2/Makefile
+++ b/minix/drivers/net/atl2/Makefile
@ -2,8 +2,8 @@
 PROG=	atl2
 SRCS=	atl2.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/dec21140A/Makefile
+++ b/minix/drivers/net/dec21140A/Makefile
@ -2,8 +2,8 @@
 PROG=	dec21140A
 SRCS=	dec21140A.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/dpeth/Makefile
+++ b/minix/drivers/net/dpeth/Makefile
@ -2,8 +2,8 @@
 PROG=	dpeth
 SRCS=	3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/e1000/Makefile
+++ b/minix/drivers/net/e1000/Makefile
@ -2,8 +2,8 @@
 PROG=	e1000
 SRCS=	e1000.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/fxp/Makefile
+++ b/minix/drivers/net/fxp/Makefile
@ -2,8 +2,8 @@
 PROG=	fxp
 SRCS=	fxp.c mii.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/lan8710a/Makefile
+++ b/minix/drivers/net/lan8710a/Makefile
@ -2,8 +2,8 @@
 PROG=   lan8710a
 SRCS=   lan8710a.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/lance/Makefile
+++ b/minix/drivers/net/lance/Makefile
@ -2,8 +2,8 @@
 PROG=	lance
 SRCS=	lance.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/rtl8139/Makefile
+++ b/minix/drivers/net/rtl8139/Makefile
@ -2,8 +2,8 @@
 PROG=	rtl8139
 SRCS=	rtl8139.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/rtl8169/Makefile
+++ b/minix/drivers/net/rtl8169/Makefile
@ -2,8 +2,8 @@
 PROG=	rtl8169
 SRCS=	rtl8169.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS}
--- a/minix/drivers/net/virtio_net/Makefile
+++ b/minix/drivers/net/virtio_net/Makefile
@ -2,8 +2,8 @@
 PROG=	virtio_net
 SRCS=	virtio_net.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBNETDRIVER} ${LIBSYS} ${LIBVIRTIO}
--- a/minix/drivers/system/random/Makefile
+++ b/minix/drivers/system/random/Makefile
@ -2,8 +2,8 @@
 PROG=	random
 SRCS=	main.c random.c rijndael_api.c rijndael_alg.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 .PATH:	${.CURDIR}/aes
--- a/minix/drivers/usb/usb_hub/Makefile
+++ b/minix/drivers/usb/usb_hub/Makefile
@ -2,8 +2,8 @@
 PROG=usb_hub
 SRCS=usb_hub.c urb_helper.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR=/etc/system.conf.d

 DPADD+=${LIBDDEKIT_USB_CLIENT} ${LIBDDEKIT} ${LIBUSB} ${LIBSYS} ${LIBMINLIB}
--- a/minix/drivers/usb/usb_storage/Makefile
+++ b/minix/drivers/usb/usb_storage/Makefile
@ -2,8 +2,8 @@
 PROG= usb_storage
 SRCS= urb_helper.c bulk.c scsi.c usb_storage.c

-FILES= $(PROG).conf
-FILESNAME= $(PROG)
+FILES= ${PROG}.conf
+FILESNAME= ${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+= ${LIBBLOCKDRIVER} ${LIBDDEKIT_USB_CLIENT} ${LIBSYS} ${LIBDDEKIT} ${LIBUSB}
--- a/minix/fs/vbfs/Makefile
+++ b/minix/fs/vbfs/Makefile
@ -3,8 +3,8 @@ PROG=	vbfs
 SRCS=	vbfs.c
 MAN=	vbfs.8

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 DPADD+=	${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS}
--- a/minix/lib/libddekit/build/ddekit_usb_client/Makefile
+++ b/minix/lib/libddekit/build/ddekit_usb_client/Makefile
@ -2,7 +2,7 @@ LIB=		ddekit_usb_client

 SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src

-VPATH = $(SRC_DIR) 
+VPATH = ${SRC_DIR}

 SRCS = usb_client.c

--- a/minix/lib/libddekit/build/ddekit_usb_server/Makefile
+++ b/minix/lib/libddekit/build/ddekit_usb_server/Makefile
@ -2,7 +2,7 @@ LIB=		ddekit_usb_server

 SRC_DIR = ${NETBSDSRCDIR}/minix/lib/libddekit/src

-VPATH = $(SRC_DIR) 
+VPATH = ${SRC_DIR}

 SRCS = usb_server.c

--- a/minix/net/inet/Makefile
+++ b/minix/net/inet/Makefile
@ -11,8 +11,8 @@ SRCS=	buf.c clock.c inet.c inet_config.c \
 	queryparam.c version.c
 MAN=	inet.8

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 .PATH:	${.CURDIR}/generic
--- a/minix/net/lwip/Makefile
+++ b/minix/net/lwip/Makefile
@ -10,8 +10,8 @@ SRCS=	lwip.c		\
 	inet_config.c	\
 	eth.c

-FILES=$(PROG).conf
-FILESNAME=$(PROG)
+FILES=${PROG}.conf
+FILESNAME=${PROG}
 FILESDIR= /etc/system.conf.d

 .PATH:	${.CURDIR}/generic
--- a/minix/tests/Makefile
+++ b/minix/tests/Makefile
@ -103,7 +103,7 @@ common.o: common.c
 PROGS+=		test63 mod
 .endif # ${MKPIC} == "yes"

-.for o in $(PROGS)
+.for o in ${PROGS}
 OBJS.${o} += common.o
 .endfor