summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:57:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:57:02 +0000
commit9f4868cea9c37ff42c0c01dd217c6710a6dda2aa (patch)
treeccafc2587352f57c5db8ba8fd924ca1240dfd416 /make
parentd5b004b6e3293e8758d42b3205a94a8590196882 (diff)
downloadrtems-9f4868cea9c37ff42c0c01dd217c6710a6dda2aa.tar.bz2
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.
Diffstat (limited to 'make')
-rw-r--r--make/compilers/gcc-target-default.cfg5
-rw-r--r--make/custom/gensh1.cfg2
-rw-r--r--make/custom/pc386.cfg5
3 files changed, 6 insertions, 6 deletions
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index 92ba1637ce..653f93ed0d 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/make/compilers/gcc-target-default.cfg
@@ -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
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index 5dc58d8e82..f4145d2609 100644
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -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)
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index 503143c63d..ff3fd21ee9 100644
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -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) \