Changeset a34b245 in rtems
- Timestamp:
- 10/29/01 14:39:50 (21 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 6a91771a
- Parents:
- c1368b9
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
rc1368b9 ra34b245 1 2001-10-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * Adopt more automake rules: 4 * automake/compile.am: Add LINK, CXXLINK, AS, ASCOMPILE; 5 Remove ARFLAGS, LINK.c, COMPILE.S, LINK.cc; 6 Add CPU_CFLAGS to CXXFLAGS, CFLAGS, ASFLAGS; 7 * automake/leaf.am: Add CXXLINK_APP, LINK_APP, make-exe, apply 8 CXXLINK_APP in make-cxx-exe. 9 * automake/lib.am: Add ARFLAGS. 10 1 11 2001-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 12 -
automake/compile.am
rc1368b9 ra34b245 76 76 DEFS = @DEFS@ 77 77 78 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS)\78 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \ 79 79 $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC) 80 CFLAGS = $(CFLAGS_DEFAULT) $( XCFLAGS)81 CXXFLAGS = $(CFLAGS_DEFAULT) $( XCXXFLAGS)82 ASFLAGS = $(CPU_ASFLAGS) $( XASFLAGS)80 CFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS) 81 CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS) 82 ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) 83 83 84 84 LINK_LIBS = $(LINK_LIBS_GCC272) $(LD_LIBS) … … 109 109 # 110 110 111 ARFLAGS=ruv112 113 111 # 114 112 # How to compile stuff into ${ARCH} subdirectory … … 117 115 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 118 116 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 119 117 CCLD = $(CC) 118 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 119 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 120 121 CXXLD = $(CXX) 120 122 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 121 123 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 124 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ 125 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 126 127 AS = $(CC) 128 ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -o $@ 122 129 123 130 ${ARCH}/%.o: %.c … … 137 144 138 145 ${ARCH}/%.o: %.S 139 ${ COMPILE.S} $(AM_CPPFLAGS) -DASM -o $@$<146 ${ASCOMPILE} -DASM -c $< 140 147 141 148 # Make foo.rel from foo.o … … 198 205 if RTEMS_USE_GCC272 199 206 define make-rel 200 $(L D) $(LDFLAGS_INCOMPLETE)$(XLDFLAGS) -o $@ $^207 $(LINK) -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^ 201 208 endef 202 209 else 203 210 ## gcc >= 2.8 204 211 define make-rel 205 $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ 206 -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^ 212 $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^ 207 213 endef 208 214 endif … … 210 216 ## non-gcc 211 217 define make-rel 212 $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ 213 $(XLDFLAGS) -o $@ $^ 218 $(LINK) $(XLDFLAGS) $^ 214 219 endef 215 220 endif -
automake/leaf.am
rc1368b9 ra34b245 1 1 include $(RTEMS_ROOT)/make/leaf.cfg 2 2 3 CXXLINK_APP = $(CXXLINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS) 3 4 ifndef make-cxx-exe 4 5 define make-cxx-exe 5 $(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) \ 6 $(LDLIBS) -o $@ \ 7 $(LINK_OBJS) $(LINK_LIBS) 6 $(CXXLINK_APP) 8 7 endef 9 8 @ENDIF@ 9 10 LINK_APP = $(LINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS) 11 ifndef make-exe 12 define make-exe 13 $(LINK_APP) 14 endef 15 @ENDIF@ 16 -
automake/lib.am
rc1368b9 ra34b245 6 6 AR = @AR@ 7 7 RANLIB = @RANLIB@ 8 9 ARFLAGS = ruv 8 10 9 11 define make-library
Note: See TracChangeset
for help on using the changeset viewer.