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

diff --git a/minix/drivers/audio/es1370/Makefile b/minix/drivers/audio/es1370/Makefile
index dc14d59aec33fac6a597c9271a63df2b5fc40bd4..45c6d6bec782882010eeaf0e899eeb206c979478 100644 (file)
--- 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}

diff --git a/minix/drivers/audio/es1371/Makefile b/minix/drivers/audio/es1371/Makefile
index a9a27d5b0cc60ec37c554e694cc72db24d8fa20f..1bcb580eed831261496cd766fa3ed6b1e117d6c9 100644 (file)
--- 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}

diff --git a/minix/drivers/bus/i2c/arch/earm/Makefile.inc b/minix/drivers/bus/i2c/arch/earm/Makefile.inc
index 47a38027c403765e6c0bb3ec1287be4e5f8b0be5..50a28e4d53d3cac5df4f195f0579b49d1c1f1b93 100644 (file)
--- 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

diff --git a/minix/drivers/bus/ti1225/Makefile b/minix/drivers/bus/ti1225/Makefile
index b00c36a9ecddec67f3ddd9c8c1dd0ffef4e4d82f..1b0aa51cd88aaef8e7211137e2b8b57edc5929c2 100644 (file)
--- 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}

diff --git a/minix/drivers/iommu/amddev/Makefile b/minix/drivers/iommu/amddev/Makefile
index 5e4dcd4addacdc47737fae1cb3c5acef8e65ac15..a8d2c0f7016523d898f10b2286cabac415c1bb06 100644 (file)
--- 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}

diff --git a/minix/drivers/net/3c90x/Makefile b/minix/drivers/net/3c90x/Makefile
index 7d6118f58edefa39d4a25be0f9121b47b51566fa..1358767d6bf456c8287c4be81a8e8b98b328ce1e 100644 (file)
--- 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}

diff --git a/minix/drivers/net/atl2/Makefile b/minix/drivers/net/atl2/Makefile
index c28b97ebb6cd8363ab1f326cdc496fd858a54d4e..4165db4c338f28e6be205cf348a4e95ad80ff9e8 100644 (file)
--- 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}

diff --git a/minix/drivers/net/dec21140A/Makefile b/minix/drivers/net/dec21140A/Makefile
index c78d80fe36cb5b56ff0746e672996b39f3a4d881..6ef33c09a425e9e6810addd4b0c74d43719a7ee7 100644 (file)
--- 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}

diff --git a/minix/drivers/net/dpeth/Makefile b/minix/drivers/net/dpeth/Makefile
index 346c8d688fbf2c864d598c74bea237c14da91c2a..1b3843dd9dd5d5b784b99b22c06849a06b143098 100644 (file)
--- 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}

diff --git a/minix/drivers/net/e1000/Makefile b/minix/drivers/net/e1000/Makefile
index ce59456835028985fcfb7ad84b0b5334dfc55b80..510936c04a4fc27bfa3f1deb57c4698e6b9c0fba 100644 (file)
--- 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}

diff --git a/minix/drivers/net/fxp/Makefile b/minix/drivers/net/fxp/Makefile
index 5425dec406ecea9a57b22353a5ac10710e5131d2..3fc4548f3fd9bfb3e4bc735d618580c12686d94e 100644 (file)
--- 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}

diff --git a/minix/drivers/net/lan8710a/Makefile b/minix/drivers/net/lan8710a/Makefile
index a3387079fc6ae751c4b5eaedec69a0e0b56b863e..9a610343cc2e360c9ef61f3fd1b9167b4cc3bd89 100644 (file)
--- 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}

diff --git a/minix/drivers/net/lance/Makefile b/minix/drivers/net/lance/Makefile
index b8e9deaf019eaab49319a5ea13033240ae5f3fda..5825ff2a184db0b44f78e4b2c9d67ee311ab5b6c 100644 (file)
--- 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}

diff --git a/minix/drivers/net/rtl8139/Makefile b/minix/drivers/net/rtl8139/Makefile
index 9b114f366ccd7364c94122cb431d7803c71b7612..0a3b4096b2c83f3bdb0cf41d58b3d9db37968025 100644 (file)
--- 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}

diff --git a/minix/drivers/net/rtl8169/Makefile b/minix/drivers/net/rtl8169/Makefile
index f68d3191078df11eeea0acbece168e547099e604..9650f69aa090d7479e3ff620e25185984f5894e3 100644 (file)
--- 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}

diff --git a/minix/drivers/net/virtio_net/Makefile b/minix/drivers/net/virtio_net/Makefile
index 9896e5822e85877c08dbe0b98f73c5baff5d8a3d..9901125404f2249a0905043765f4131fc77b8bf4 100644 (file)
--- 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}

diff --git a/minix/drivers/system/random/Makefile b/minix/drivers/system/random/Makefile
index 1842fb1d92b6d3e9c8d24c4abe5313ff454d0edf..00c96af5a7c5a81bed516dd90f0093d831fc76b3 100644 (file)
--- 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

diff --git a/minix/drivers/usb/usb_hub/Makefile b/minix/drivers/usb/usb_hub/Makefile
index acfd5406cc5cabc43888211341d085f0b20ac455..15c251afc6aff40fff4cf455a4faabff48def723 100644 (file)
--- 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}

diff --git a/minix/drivers/usb/usb_storage/Makefile b/minix/drivers/usb/usb_storage/Makefile
index 6c37a9c42a1e4fc7ead863f483adac288c790abb..4bb6017aff338cf9d6a296217206ed38c6e42007 100644 (file)
--- 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}

diff --git a/minix/fs/vbfs/Makefile b/minix/fs/vbfs/Makefile
index 1051f066a4787c23c6deb1a06e4cb767504f637a..e607b16bd4f81c328ae1ab57e6116d6656f31b61 100644 (file)
--- 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}

diff --git a/minix/lib/libddekit/build/ddekit_usb_client/Makefile b/minix/lib/libddekit/build/ddekit_usb_client/Makefile
index 8deaec29fb6af870a5673bbaca5c9bb1672cc42e..8e56c51d460697b02391388c9e37f471b1f37834 100644 (file)
--- 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
 

diff --git a/minix/lib/libddekit/build/ddekit_usb_server/Makefile b/minix/lib/libddekit/build/ddekit_usb_server/Makefile
index 2d31ab0dea1bea94e137e23a6a809975b1335fec..9f2aff757f951180b4a72f3e9455e4af66c36858 100644 (file)
--- 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
 

diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile
index a3b4fce203c5c533ee9a245a3d9a96781f8a474a..0b2ced881aca58b3781e19023867d9ca5a5d6941 100644 (file)
--- 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

diff --git a/minix/net/lwip/Makefile b/minix/net/lwip/Makefile
index b325b9bfed45167bc206edd0cf822306932434cf..a11bbd82e72659f7962c45960fdb4dbc885ecc67 100644 (file)
--- 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

diff --git a/minix/tests/Makefile b/minix/tests/Makefile
index 742eab00e5313438043cf22e4ae066e618a6f0d9..fbe00c29c24155c4cc7981d93ed5308c44dfdea7 100644 (file)
--- 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