9 files changed, 14 insertions, 49 deletions
diff --git a/make/custom/bf537Stamp.cfg b/make/custom/bf537Stamp.cfg
index 532df9f3a6..666bb8971b 100644
--- a/make/custom/bf537Stamp.cfg
+++ b/make/custom/bf537Stamp.cfg
@@ -12,22 +12,8 @@ RTEMS_BSP_FAMILY=bf537Stamp
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
-#
 CPU_CFLAGS =
 
 # optimize flag: typically -O2
 # gcc-4.2.0 segfaults on -OX > -O0
 CFLAGS_OPTIMIZE_V = -O2 -g
-
-# The following are definitions of make-exe which will work using ld as
-# is currently required.
-
-define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    $(LDLIBS) -o $@ \
-	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $@ > $(basename $@).num
-	$(SIZE) $@
-endef
-
-# Miscellaneous additions go here
diff --git a/make/custom/gen5200.cfg b/make/custom/gen5200.cfg
index f4d1fb1c69..39cdc313c1 100644
--- a/make/custom/gen5200.cfg
+++ b/make/custom/gen5200.cfg
@@ -22,4 +22,4 @@ CPU_CFLAGS = -mcpu=603e -mstrict-align \
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
 
-AM_LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS) 
+LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS) 
diff --git a/make/custom/gen83xx.cfg b/make/custom/gen83xx.cfg
index b99e461d35..d8faa53327 100644
--- a/make/custom/gen83xx.cfg
+++ b/make/custom/gen83xx.cfg
@@ -26,4 +26,4 @@ CPU_CFLAGS = -mcpu=603e -mstrict-align -fno-strict-aliasing \
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions -funit-at-a-time -W -Wno-unused
 
-AM_LDFLAGS+= -qnolinkcmds -T $(RTEMS_LINKCMDS)
+LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS)
diff --git a/make/custom/genmcf548x.cfg b/make/custom/genmcf548x.cfg
index 680ac6d0d2..480a7a4c40 100644
--- a/make/custom/genmcf548x.cfg
+++ b/make/custom/genmcf548x.cfg
@@ -21,22 +21,10 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
 #MTARGET=ram
 #endif
 
+LDFLAGS = -qnolinkcmds -Wl,-T$(RTEMS_LINKCMDS)
 
-# The following are definitions of make-exe which will work using ld as
-# is currently required.
-
-
-define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
-	    $(LINK_OBJS) $(LINK_LIBS) -qnolinkcmds -Wl,-T$(RTEMS_LINKCMDS)
-	$(OBJCOPY) -O binary --strip-all $(basename $@).nxe $@
-	$(SIZE) $(basename $@).nxe
+define bsp-post-link
+	$(OBJCOPY) -O binary --strip-all $(basename $@).exe \
+	    $(basename $@)$(DOWNEXT)
+	$(default-bsp-post-link)
 endef
-define make-cxx-exe
-	$(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \
-	    $(LINK_OBJS) $(LINK_LIBS) -qnolinkcmds -Wl,-T$(RTEMS_LINKCMDS)
-	$(OBJCOPY) -O binary --strip-all $(basename $@).nxe $@
-	$(SIZE) $(basename $@).nxe
-endef
-
-# Miscellaneous additions go here
diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg
index 621a1d76d2..dc67fa4c28 100644
--- a/make/custom/mbx8xx.cfg
+++ b/make/custom/mbx8xx.cfg
@@ -51,7 +51,7 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
 # Override default start file
 START_BASE=
 
-AM_LDFLAGS += $(MBX8xx_LDFLAGS)
+LDFLAGS += $(MBX8xx_LDFLAGS)
 
 define bsp-post-link
 	cp $(basename $@).exe $(basename $@)$(DOWNEXT) 
diff --git a/make/custom/mpc55xx.cfg b/make/custom/mpc55xx.cfg
index c77ea020b9..a178903206 100644
--- a/make/custom/mpc55xx.cfg
+++ b/make/custom/mpc55xx.cfg
@@ -16,12 +16,7 @@ RTEMS_CPU_MODEL = mpc55xx
 RTEMS_BSP_FAMILY = mpc55xxevb
 
 # FIXME
-CPU_CFLAGS = -mcpu=8540 -meabi -msdata -fno-common -funit-at-a-time -D__ppc_generic -mstrict-align -D$(RTEMS_BOARD_MODEL)
+CPU_CFLAGS = -mcpu=8540 -meabi -msdata -fno-common -funit-at-a-time \
+    -D__ppc_generic -mstrict-align -D$(RTEMS_BOARD_MODEL)
 
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
-
-define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS)-o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
-endef
diff --git a/make/custom/nds.cfg b/make/custom/nds.cfg
index 7d88e2e953..004496e75e 100644
--- a/make/custom/nds.cfg
+++ b/make/custom/nds.cfg
@@ -23,9 +23,6 @@ CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) -msoft-float -mstructure-size-boundary=8
 CFLAGS_OPTIMIZE_V = -O2
 #CFLAGS_OPTIMIZE_V = -Os
 
-# The following are definitions of make-exe which will work using ld as
-# is currently required.
-
 NDSTOOL = $(PROJECT_TOOLS)/ndstool
 
 ifeq ($(RTEMS_MAKEFILE_PATH),)
@@ -37,8 +34,7 @@ endif
 define bsp-post-link
 	$(default-bsp-post-link)
 	$(OBJCOPY) -O binary $(basename $@).exe $(basename $@).bin
-	$(NDSTOOL) -c $(basename $@).nds -9 $(basename $@).bin -7 $(COPROC_ELF_PATH)/coproc.bin
+	$(NDSTOOL) -c $(basename $@).nds -9 $(basename $@).bin \
+	    -7 $(COPROC_ELF_PATH)/coproc.bin
 	rm -f $(basename $@).bin
 endef
-
-# Miscellaneous additions go here
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index 4be98089d5..ce65fe8a95 100644
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -44,7 +44,7 @@ START16FILE=$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin
 START16ADDR=0x00097C00
 HEADERADDR=0x00097E00
 
-AM_LDFLAGS+= -Wl,-Ttext,$(RELOCADDR)
+LDFLAGS += -Wl,-Ttext,$(RELOCADDR)
 
 define bsp-post-link
 	$(default-bsp-post-link)
diff --git a/make/custom/tqm8xx.cfg b/make/custom/tqm8xx.cfg
index c1063a788e..12c6820be7 100644
--- a/make/custom/tqm8xx.cfg
+++ b/make/custom/tqm8xx.cfg
@@ -18,7 +18,7 @@ CPU_CFLAGS = -mcpu=860 -Dmpc860 -D$(RTEMS_TQM_MODEL) \
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
 
 RTEMS_LINKCMDS=linkcmds.tqm8xx
-AM_LDFLAGS+= -qnolinkcmds -T $(RTEMS_LINKCMDS)
+LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS)
 
 define bsp-post-link
 	cp $(basename $@).exe $(basename $@)$(DOWNEXT)