2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4.
	* aclocal/subdirs.m4: New file.
	* aclocal/multi.m4: New file, adopted from autoconf-2.52 w/
	modifications.
	* aclocal/check-posix.m4: Apply AS_IF.
	* aclocal/config-subdirs.m4: Reflect changes to other m4-macros.
	* aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE.
	Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs.
	* aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for
	MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs.
	Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir.
	* aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's
	OUTPUT_COMMANDS.
	* aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE.
	* aclocal/rtems-debug.m4: Minor cleanups.
	* aclocal/rtems-top.m4: Minor cleanups.
	* automake/compile.am: Further steps towards automake's rules.
This commit is contained in:
Joel Sherrill
2001-12-20 17:33:23 +00:00
parent f92cc34b38
commit ba748523d1
13 changed files with 536 additions and 262 deletions

View File

@@ -118,14 +118,14 @@ 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)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AS = $(CC)
ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -o $@
ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
${ARCH}/%.o: %.c
${COMPILE} -o $@ -c $<
@@ -143,7 +143,7 @@ ${ARCH}/%.o: %.C
${CXXCOMPILE} -o $@ -c $<
${ARCH}/%.o: %.S
${ASCOMPILE} -DASM -c $<
${ASCOMPILE} -DASM -o $@ -c $<
# Make foo.rel from foo.o
${ARCH}/%.rel: ${ARCH}/%.o
@@ -176,7 +176,7 @@ depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
## Replace foo.o with $(ARCH)/foo.o
## Replace $(ARCH) value with string $(ARCH)
## so that it will for debug and profile cases
$(COMPILE) $(AM_CPPFLAGS) $(AM_CFLAGS) -M $^ | \
$(COMPILE) -M $^ | \
sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
-e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp
mv $(DEPEND).tmp $(DEPEND)
@@ -204,7 +204,7 @@ LINK_FILES =\
if RTEMS_USE_GCC
if RTEMS_USE_GCC272
define make-rel
$(LINK) -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
$(LINK) -nostdlib -Wl,-r $(XLDFLAGS) $^
endef
else
## gcc >= 2.8