From 53089271a1128b72f030d0f73120ac9de3bf63ab Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sun, 2 Jun 2013 11:44:23 +0000 Subject: [PATCH] Convert old make variable modifiers :U and :L to bmake :tu and :tl. Reviewed by: sjg --- lib/ncurses/form/Makefile | 2 +- lib/ncurses/menu/Makefile | 2 +- lib/ncurses/panel/Makefile | 2 +- release/Makefile | 4 ++-- sys/boot/arm/at91/Makefile.inc | 2 +- sys/boot/arm/at91/boot2/Makefile | 2 +- sys/boot/arm/ixp425/Makefile.inc | 2 +- sys/boot/arm/ixp425/boot2/Makefile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile index d05cbfec0fb..aa122422073 100644 --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -54,7 +54,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} CFLAGS+= -I${NCURSES_DIR}/menu -DPADD= ${LIBNCURSES${LIB_SUFFIX:U}} +DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} LDADD= -lncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile index 19a1ff3ce9c..46bc023e4d8 100644 --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -40,7 +40,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:U}} +DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} LDADD= -lncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile index 689586de2d3..8e997675dd6 100644 --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -29,7 +29,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:U}} +DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} LDADD= -lncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) diff --git a/release/Makefile b/release/Makefile index 830e4ea04dd..1222647e5e3 100644 --- a/release/Makefile +++ b/release/Makefile @@ -113,8 +113,8 @@ reldoc: INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc mkdir -p reldoc .for i in hardware readme relnotes errata - ln -f rdoc/${RELNOTES_LANG}/${i}/article.txt reldoc/${i:U}.TXT - ln -f rdoc/${RELNOTES_LANG}/${i}/article.html reldoc/${i:U}.HTM + ln -f rdoc/${RELNOTES_LANG}/${i}/article.txt reldoc/${i:tu}.TXT + ln -f rdoc/${RELNOTES_LANG}/${i}/article.html reldoc/${i:tu}.HTM .endfor cp rdoc/${RELNOTES_LANG}/readme/docbook.css reldoc diff --git a/sys/boot/arm/at91/Makefile.inc b/sys/boot/arm/at91/Makefile.inc index 2f528e36591..3c6f5ca8b05 100644 --- a/sys/boot/arm/at91/Makefile.inc +++ b/sys/boot/arm/at91/Makefile.inc @@ -21,7 +21,7 @@ CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -Wmissing-declarations # -Wstrict-prototypes -CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} +CFLAGS+=-DBOOT_${BOOT_FLAVOR:tu} LIBAT91=${.OBJDIR}/../libat91/libat91.a diff --git a/sys/boot/arm/at91/boot2/Makefile b/sys/boot/arm/at91/boot2/Makefile index 82054259bae..ea02b8e5de1 100644 --- a/sys/boot/arm/at91/boot2/Makefile +++ b/sys/boot/arm/at91/boot2/Makefile @@ -4,7 +4,7 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:L}_board.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} diff --git a/sys/boot/arm/ixp425/Makefile.inc b/sys/boot/arm/ixp425/Makefile.inc index 37af9c7b374..031b7afa616 100644 --- a/sys/boot/arm/ixp425/Makefile.inc +++ b/sys/boot/arm/ixp425/Makefile.inc @@ -21,7 +21,7 @@ CFLAGS+=-Os -ffreestanding \ # -Wstrict-prototypes -CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} +CFLAGS+=-DBOOT_${BOOT_FLAVOR:tu} LD ?= ld OBJCOPY ?= objcopy diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile index a329b65c0db..07b8be71879 100644 --- a/sys/boot/arm/ixp425/boot2/Makefile +++ b/sys/boot/arm/ixp425/boot2/Makefile @@ -12,7 +12,7 @@ FIXUP_BOOT_DRV=yes P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:L}_board.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c SRCS+=memchr.c memcmp.c memcpy.c memmem.c memset.c printf.c strcmp.c strcpy.c SRCS+=strlen.c ashldi3.c divsi3.S muldi3.c NO_MAN=