[PATCH 2/3] or1ksim: Add tm27.h to include_HEADERS

[Hesham Moustafa]

On Tue, Sep 2, 2014 at 4:31 PM, Joel Sherrill <joel.sherrill at oarcorp.com> wrote:
> I think this patch installs tm27.h is redundant with one I already
> committed.
>
> tm27 has "#include <tm27.h>" and this patch would have installed
> a second copy under the bsp/ subdirectory. That may in fact be the
> correct location but it isn't where it is expected to be.
>
I added this patch because (after I resolved the issue of missing
_CPU_Context_volatile_clobber) functions, I came across "no such file
or directory" for <tm27.h> from tm27 test.
> It would have to be moved for all BSPs and tm27 at the same time. :(
>
Should I delete the bsp/tm27.h from the or1ksim/Makefile.am, or leave
it as is for now?
> --joel
>
> On 8/31/2014 6:29 PM, Hesham ALMatary wrote:
>> Add tm27.h to include_HEADERS instead of include_bsp_HEADERS for
>> or1ksim BSP.
>> ---
>>  c/src/lib/libbsp/or1k/or1ksim/Makefile.am   |  1 +
>>  c/src/lib/libbsp/or1k/or1ksim/preinstall.am | 10 +++++++---
>>  2 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
>> index 1ff43ed..1ad61c8 100644
>> --- a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
>> +++ b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
>> @@ -19,6 +19,7 @@ dist_project_lib_DATA = bsp_specs
>>
>>  include_bsp_HEADERS =
>>  include_HEADERS = include/bsp.h
>> +include_HEADERS += ../../shared/include/tm27.h
>>
>>  nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
>>  include_bsp_HEADERS += ../shared/include/linker-symbols.h
>> diff --git a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
>> index a83e053..26c9da9 100644
>> --- a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
>> +++ b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
>> @@ -5,9 +5,6 @@ $(srcdir)/preinstall.am: Makefile.am
>>       $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
>>  endif
>>
>> -PREINSTALL_DIRS =
>> -DISTCLEANFILES += $(PREINSTALL_DIRS)
>> -
>>  all-am: $(PREINSTALL_FILES)
>>
>>  PREINSTALL_FILES =
>> @@ -18,6 +15,9 @@ all-local: $(TMPINSTALL_FILES)
>>  TMPINSTALL_FILES =
>>  CLEANFILES += $(TMPINSTALL_FILES)
>>
>> +PREINSTALL_DIRS =
>> +DISTCLEANFILES += $(PREINSTALL_DIRS)
>> +
>>  $(PROJECT_LIB)/$(dirstamp):
>>       @$(MKDIR_P) $(PROJECT_LIB)
>>       @: > $(PROJECT_LIB)/$(dirstamp)
>> @@ -46,6 +46,10 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
>>       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
>>  PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
>>
>> +$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
>> +     $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
>> +PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
>> +
>>  $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
>>       $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
>>  PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
>
> --
> Joel Sherrill, Ph.D.             Director of Research & Development
> joel.sherrill at OARcorp.com        On-Line Applications Research
> Ask me about RTEMS: a free RTOS  Huntsville AL 35805
> Support Available                (256) 722-9985
>