From a34b2458a4c6fade5bca0445e224ddea68ebb4bf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Oct 2001 14:39:50 +0000 Subject: 2001-10-29 Ralf Corsepius * Adopt more automake rules: * automake/compile.am: Add LINK, CXXLINK, AS, ASCOMPILE; Remove ARFLAGS, LINK.c, COMPILE.S, LINK.cc; Add CPU_CFLAGS to CXXFLAGS, CFLAGS, ASFLAGS; * automake/leaf.am: Add CXXLINK_APP, LINK_APP, make-exe, apply CXXLINK_APP in make-cxx-exe. * automake/lib.am: Add ARFLAGS. --- automake/leaf.am | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'automake/leaf.am') diff --git a/automake/leaf.am b/automake/leaf.am index b36ed33fbb..f6a9c5ce15 100644 --- a/automake/leaf.am +++ b/automake/leaf.am @@ -1,9 +1,16 @@ include $(RTEMS_ROOT)/make/leaf.cfg +CXXLINK_APP = $(CXXLINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS) ifndef make-cxx-exe define make-cxx-exe - $(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) \ - $(LDLIBS) -o $@ \ - $(LINK_OBJS) $(LINK_LIBS) + $(CXXLINK_APP) endef @ENDIF@ + +LINK_APP = $(LINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS) +ifndef make-exe +define make-exe + $(LINK_APP) +endef +@ENDIF@ + -- cgit v1.2.3