Miscellaneous patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that are part of the Makefile.am conversion effort but were missed
in the previous commits.
This commit is contained in:
Joel Sherrill
1999-11-23 13:57:02 +00:00
parent d5b004b6e3
commit 9f4868cea9
30 changed files with 1256 additions and 245 deletions

View File

@@ -224,7 +224,7 @@ CLOBBER_DEPEND=$(DEPEND)
# on 'make clean'
#
depend: $(C_FILES) $(CC_FILES) $(S_FILES)
depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
# Use gcc -M to generate dependencies
# Replace foo.o with $(ARCH)/foo.o
@@ -235,6 +235,7 @@ ifneq ($(words $(C_FILES) $(CC_FILES) $(S_FILES)), 0)
-e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp
$(MV) $(DEPEND).tmp $(DEPEND)
endif
depend: depend-am
# spell out all the LINK_FILE's, rather than using -lbsp, so
# that $(LINK_FILES) can be a dependency
@@ -306,5 +307,5 @@ endif
define make-rel
$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^
endef

View File

@@ -36,8 +36,6 @@ CFLAGS_DEBUG_V =
# -O4 is ok for RTEMS
CFLAGS_OPTIMIZE_V = -O4
CPPFLAGS+=$(BSP_CPPFLAGS)
# This section makes the target dependent options file.
# NDEBUG (C library)

View File

@@ -96,9 +96,10 @@ define make-exe
$(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
$(NM) -g -n $(basename $@).obj > $(basename $@).num
$(SIZE) $(basename $@).obj
$(INSTALL_VARIANT) -m 555 $(basename $@).bt ${PROJECT_RELEASE}/BootImgs
@$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs
$(INSTALL_PROGRAM) $(basename $@).bt ${PROJECT_RELEASE}/BootImgs
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
-o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
-o $@ $(LINK_OBJS) $(LINK_LIBS)
endef
define make-cxx-exe
$(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \