diff options
| author | Ralf Corsépius <ralf.corsepius@rtems.org> | 2013-02-14 23:36:24 +0100 |
|---|---|---|
| committer | Ralf Corsépius <ralf.corsepius@rtems.org> | 2013-02-14 23:46:39 +0100 |
| commit | fa1004bdebbad853a9d40eeec795683e693d922b (patch) | |
| tree | 7218e39c5e4302a3bfdc0bd0454f189dc7c2dda5 | |
| parent | Add RTEMS_CHECK_ATOMIC, RTEMS_CPUOPT([RTEMS_ATOMIC]), AM_CONDITIONAL ATOMIC. (diff) | |
| download | rtems-fa1004bdebbad853a9d40eeec795683e693d922b.tar.bz2 | |
Conditionally install atomic-headers.
| -rw-r--r-- | cpukit/rtems/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/rtems/preinstall.am | 3 | ||||
| -rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/score/preinstall.am | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 768d451588..607a98ba8e 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -39,7 +39,9 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/support.h include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h include_rtems_rtems_HEADERS += include/rtems/rtems/types.h +if ATOMIC include_rtems_rtems_HEADERS += include/rtems/rtems/atomic.h +endif include_rtems_rtems_HEADERS += mainpage.h if HAS_MP diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am index f64600fe10..d7d9a63431 100644 --- a/cpukit/rtems/preinstall.am +++ b/cpukit/rtems/preinstall.am @@ -127,10 +127,11 @@ $(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h $(PROJECT_IN $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h +if ATOMIC $(PROJECT_INCLUDE)/rtems/rtems/atomic.h: include/rtems/rtems/atomic.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/atomic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/atomic.h - +endif $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h: mainpage.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index cdfe3c6b1f..8da32a5dc2 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -57,8 +57,10 @@ include_rtems_score_HEADERS += include/rtems/score/watchdog.h include_rtems_score_HEADERS += include/rtems/score/wkspace.h include_rtems_score_HEADERS += include/rtems/score/cpuopts.h include_rtems_score_HEADERS += include/rtems/score/basedefs.h +if ATOMIC include_rtems_score_HEADERS += include/rtems/score/atomic.h include_rtems_score_HEADERS += include/rtems/score/genericcpuatomic.h +endif if HAS_SMP include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/smp.h diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 4295df4a8a..a346c79056 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -211,6 +211,7 @@ $(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h +if ATOMIC $(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h @@ -218,7 +219,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h: include/rtems/score/genericcpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/genericcpuatomic.h - +endif if HAS_SMP $(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h |