From 8725d7cce37febd034f48d362029d8c865e25253 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 1 Aug 2000 14:21:40 +0000 Subject: Patch rtems-rc-20000731-2-cvs.diff from Ralf Corsepius that does the following: Changes: Remove $(SED) and $(CP) from make/custom/*.cfg Motivation: * autoconf and automake presuppose sed and cp to be present. * make/host.cfg.in already contains SED = sed hard-coded into it for a long time. * Elimination of make-variables * Eliminate make/*.cfg files or at least reduce their complexity :) --- make/custom/dmv152.cfg | 4 ++-- make/custom/dmv177.cfg | 2 +- make/custom/efi332.cfg | 4 ++-- make/custom/efi68k.cfg | 4 ++-- make/custom/i386ex.cfg | 4 ++-- make/custom/idp.cfg | 4 ++-- make/custom/mcp750.cfg | 2 +- make/custom/mvme136.cfg | 4 ++-- make/custom/mvme147.cfg | 4 ++-- make/custom/mvme162.cfg | 4 ++-- make/custom/mvme2307.cfg | 2 +- make/custom/ts_386ex.cfg | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) (limited to 'make/custom') diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index aeae57065b..b9cb7a3c5b 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -51,7 +51,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -61,7 +61,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $@ $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg index 452ac13478..285429c3c7 100644 --- a/make/custom/dmv177.cfg +++ b/make/custom/dmv177.cfg @@ -86,7 +86,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/efi332.cfg b/make/custom/efi332.cfg index c62ef47b86..65fe1acdfb 100644 --- a/make/custom/efi332.cfg +++ b/make/custom/efi332.cfg @@ -33,7 +33,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -43,7 +43,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index 50c9880513..66e3b5e16e 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -37,7 +37,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -47,7 +47,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $@ $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index ff2535d750..3357ad5a7c 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -45,7 +45,7 @@ define make-exe -noinhibit-exec -Map $(basename $@).map \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).coff > $(basename $@).num $(SIZE) $(basename $@).coff @@ -55,7 +55,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).coff \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).coff > $(basename $@).num $(SIZE) $(basename $@).coff diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg index e8246006ff..ede6f2ea28 100644 --- a/make/custom/idp.cfg +++ b/make/custom/idp.cfg @@ -40,7 +40,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -50,7 +50,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg index 95057ba777..7262d59f0b 100644 --- a/make/custom/mcp750.cfg +++ b/make/custom/mcp750.cfg @@ -80,7 +80,7 @@ define make-exe $(NM) -g -n $@ > $(basename $@).num $(SIZE) $@ test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin - $(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ + cp $@ $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \ $(MAKE) bootloader BINARY_LOADED=$@; ) f=`basename $@ .exe`; \ diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg index 1e9741de26..a2e418963e 100644 --- a/make/custom/mvme136.cfg +++ b/make/custom/mvme136.cfg @@ -36,7 +36,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -46,7 +46,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg index 06dd46cbb3..f74f28d20f 100644 --- a/make/custom/mvme147.cfg +++ b/make/custom/mvme147.cfg @@ -33,7 +33,7 @@ define make-exe $(LD) $(LDFLAGS) -N -T $(LINKCMDS) -o $(basename $@).nxe \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -43,7 +43,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index 2470dc3b8d..12ee5fa2e2 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -64,7 +64,7 @@ define make-exe $(START_FILE) $(LINK_OBJS) \ --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe @@ -74,7 +74,7 @@ define make-exe $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg index 00c8d61417..838731615a 100644 --- a/make/custom/mvme2307.cfg +++ b/make/custom/mvme2307.cfg @@ -78,7 +78,7 @@ define make-exe # The following commands make a bootable image but will not work outside # the build tree. # test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin -# $(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ +# cp $@ $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ # ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \ # $(MAKE) bootloader BINARY_LOADED=$@; ) # f=`basename $@ .exe`; \ diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg index b9f47babc2..4294a749aa 100644 --- a/make/custom/ts_386ex.cfg +++ b/make/custom/ts_386ex.cfg @@ -56,7 +56,7 @@ define make-exe -noinhibit-exec -Map $(basename $@).map \ $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group $(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i - $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ $(PACKHEX) > $(basename $@).exe $(NM) -g -n $(basename $@).coff > $(basename $@).num $(SIZE) $(basename $@).coff -- cgit v1.2.3