Changeset 1fdc990 in rtems

Timestamp:

02/18/99 17:46:59 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

011677f

Parents:

6b9aaf7

Message:

Part of the targopts.h change in generation patch from Ralf Corsepius
<corsepiu@…>.

Files:

• c/Makefile.in (modified) (2 diffs)
• make/leaf.cfg (modified) (1 diff)

c/Makefile.in

@@ -63 +63 @@
     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
@@ -104 +106 @@
 .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

make/leaf.cfg

@@ -127 +127 @@
         $(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