summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 17:46:59 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-02-18 17:46:59 +0000
commit1fdc990e98ed42653a7e9cba401fbe88148f99d2 (patch)
tree6b1f851167e5bf4090aebe54315d0c03086271a4
parent6b9aaf7e12ef5b5c92253ee114a0b5da83ac8d01 (diff)
downloadrtems-1fdc990e98ed42653a7e9cba401fbe88148f99d2.tar.bz2
Part of the targopts.h change in generation patch from Ralf Corsepius
<corsepiu@faw.uni-ulm.de>.
Diffstat (limited to '')
-rw-r--r--c/Makefile.in8
-rw-r--r--make/leaf.cfg51
2 files changed, 6 insertions, 53 deletions
diff --git a/c/Makefile.in b/c/Makefile.in
index 2f3eaaedc0..0e13451cce 100644
--- a/c/Makefile.in
+++ b/c/Makefile.in
@@ -62,6 +62,8 @@ CREATE_DIRS = \
tests/screens/mptests/node1 tests/screens/mptests/node2 \
build-tools update-tools
+BUILD_DIRS = ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
+
# Make all/install must include 'env'
# if something is added to TARGET_VARIANTS, then account for it here
make_src_makefiles: Makefile.in Makefile
@@ -103,12 +105,14 @@ clean_wrapup: clean_tools clean_dirs clean_modules
.PHONY: dirs clean_wrapup clean_dirs clean_tools clean_modules env install
-dirs:
- -$(MKDIR) ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
+$(BUILD_DIRS):
+ -$(MKDIR) $(BUILD_DIRS)
if test -d $(PROJECT_ROOT)/c/src/lib/libhwapi; then \
(cd $(PROJECT_ROOT)/c/src/lib/libhwapi ; $(MAKE) mkdirs) \
fi
+dirs: $(BUILD_DIRS)
+
distclean: clobber
clean_dirs:
diff --git a/make/leaf.cfg b/make/leaf.cfg
index a553943b13..ce562ee755 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -126,57 +126,6 @@ clobber: clean
$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
$(RM) -r $(CLOBBER_ADDITIONS) a.out
-# Until RTEMS_CPU is removed from all the make configuration files,
-# this will need to be here to transform hppa1.1 into hppa1_1 to
-# make it a valid cpp symbol. At some point in the near future,
-# targopts.h should not define RTEMS_CPU. As best I can tell,
-# gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL
-# on some families but not on others. For example, the i386
-# family does not give us enough information from the predefines.
-RTEMS_CPU_DEFINED=$(subst .,_,$(RTEMS_CPU))
-
-# make the target dependent options file
-$(ARCH)/targopts.h-tmp: FORCE
- @echo "/* target board dependent options file */" >$@
- @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
- @echo >>$@
- @echo "#ifndef __TARGET_OPTIONS_h" >>$@
- @echo "#define __TARGET_OPTIONS_h" >>$@
- @echo >>$@
- @echo "#ifdef $(RTEMS_CPU_DEFINED)" >>$@
- @echo "#undef $(RTEMS_CPU_DEFINED)" >>$@
- @echo "#endif" >>$@
- @echo "#define $(RTEMS_CPU_DEFINED) 1" >>$@
- @echo >>$@
- @echo "#ifdef $(RTEMS_CPU_MODEL)" >>$@
- @echo "#undef $(RTEMS_CPU_MODEL)" >>$@
- @echo "#endif" >>$@
- @echo "#define $(RTEMS_CPU_MODEL) 1" >>$@
- @echo >>$@
- @echo "#ifdef $(RTEMS_BSP)" >>$@
- @echo "#undef $(RTEMS_BSP)" >>$@
- @echo "#endif" >>$@
- @echo "#define $(RTEMS_BSP) 1" >>$@
- @echo >>$@
- @$(make-target-options)
-ifeq (${RTEMS_USE_MACROS},yes)
- @echo "#define USE_MACROS 1" >>$@
-else
- @echo "#define USE_INLINES 1" >>$@
-endif
-ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
- @echo "#define RTEMS_MULTIPROCESSING 1" >>$@
-endif
-ifeq ($(RTEMS_HAS_POSIX_API),yes)
- @echo "#define RTEMS_POSIX_API 1" >>$@
-endif
-ifeq ($(RTEMS_USE_NEWLIB),yes)
- @echo "#define RTEMS_NEWLIB 1" >>$@
- @echo "#define MALLOC_PROVIDED 1" >>$@
-endif
- @echo >>$@
- @echo "#endif" >>$@
-
ifeq ($(RTEMS_BSP),bare)
$(ARCH)/bsp_specs.tmp: FORCE
cp $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY)/bsp_specs $@