diff options
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/Makefile.am | 6 | ||||
| -rw-r--r-- | cpukit/score/preinstall.am | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4905ea87b2..ad0cd929ad 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2011-05-17 Joel Sherrill <joel.sherrill@oarcorp.com> + * score/Makefile.am, score/preinstall.am: bspsmp.h is now supposed to + be installed all the time. Revert part of previous commit. + +2011-05-17 Joel Sherrill <joel.sherrill@oarcorp.com> + * score/inline/rtems/score/schedulersimple.inl, score/src/schedulersimpleyield.c: Fix violations of naming convention. diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 38df872557..02d65b5ad1 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -12,11 +12,7 @@ SUBDIRS = cpu include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = include/rtems/debug.h include/rtems/system.h \ - include/rtems/seterr.h - -if HAS_SMP -include_rtems_HEADERS += include/rtems/bspsmp.h -endif + include/rtems/seterr.h include/rtems/bspsmp.h include_rtems_scoredir = $(includedir)/rtems/score diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 7891b6fd84..f3021184a8 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -30,11 +30,10 @@ $(PROJECT_INCLUDE)/rtems/seterr.h: include/rtems/seterr.h $(PROJECT_INCLUDE)/rte $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/seterr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/seterr.h -if HAS_SMP $(PROJECT_INCLUDE)/rtems/bspsmp.h: include/rtems/bspsmp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspsmp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bspsmp.h -endif + $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) |