Changeset a34b245 in rtems

Timestamp:

Oct 29, 2001, 2:39:50 PM (18 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

6a91771a

Parents:

c1368b9

Message:

2001-10-29 Ralf Corsepius <corsepiu@…>

• 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.

Files:

• ChangeLog (modified) (1 diff)
• automake/compile.am (modified) (6 diffs)
• automake/leaf.am (modified) (1 diff)
• automake/lib.am (modified) (1 diff)

ChangeLog

@@ +1 @@
+2001-10-29      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * 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.
+
 2001-10-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

automake/compile.am

@@ -76 +76 @@
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
+CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
    $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
-CFLAGS   = $(CFLAGS_DEFAULT) $(XCFLAGS)
-CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS)
-ASFLAGS  = $(CPU_ASFLAGS) $(XASFLAGS)
+CFLAGS   = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
+CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
+ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
 LINK_LIBS = $(LINK_LIBS_GCC272) $(LD_LIBS)
@@ -109 +109 @@
 #
 
-ARFLAGS=ruv
-
 #
 # How to compile stuff into ${ARCH} subdirectory
@@ -117 +115 @@
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+CXXLD = $(CXX)
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+AS = $(CC)
+ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -o $@
 
 ${ARCH}/%.o: %.c
@@ -137 +144 @@
 
 ${ARCH}/%.o: %.S
-        ${COMPILE.S} $(AM_CPPFLAGS) -DASM -o $@ $<
+        ${ASCOMPILE} -DASM -c $<
 
 # Make foo.rel from foo.o
@@ -198 +205 @@
 if RTEMS_USE_GCC272
 define make-rel
-        $(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^
+        $(LINK) -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
 endef
 else
 ## gcc >= 2.8
 define make-rel
-        $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-          -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
+        $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^
 endef
 endif
@@ -210 +216 @@
 ## non-gcc
 define make-rel
-        $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-          $(XLDFLAGS) -o $@ $^
+        $(LINK) $(XLDFLAGS) $^
 endef
 endif

automake/leaf.am

@@ -1 +1 @@
 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@
+

automake/lib.am

@@ -6 +6 @@
 AR = @AR@
 RANLIB = @RANLIB@
+
+ARFLAGS = ruv
 
 define make-library