diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/score/cpu/nios2/Makefile.am | 18 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/headers.am | 20 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/machine/elf_machdep.h (renamed from cpukit/libdl/include/arch/nios2/machine/elf_machdep.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/asm.h (renamed from cpukit/score/cpu/nios2/rtems/asm.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/cpu.h (renamed from cpukit/score/cpu/nios2/rtems/score/cpu.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h (renamed from cpukit/score/cpu/nios2/rtems/score/cpu_asm.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h (renamed from cpukit/score/cpu/nios2/rtems/score/cpuatomic.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h (renamed from cpukit/score/cpu/nios2/rtems/score/cpuimpl.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h (renamed from cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h (renamed from cpukit/score/cpu/nios2/rtems/score/nios2-utility.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/nios2.h (renamed from cpukit/score/cpu/nios2/rtems/score/nios2.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/include/rtems/score/types.h (renamed from cpukit/score/cpu/nios2/rtems/score/types.h) | 0 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/preinstall.am | 61 |
13 files changed, 21 insertions, 78 deletions
diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am index b3e9d28c01..243f937e51 100644 --- a/cpukit/score/cpu/nios2/Makefile.am +++ b/cpukit/score/cpu/nios2/Makefile.am @@ -3,22 +3,6 @@ include $(top_srcdir)/automake/compile.am CLEANFILES = DISTCLEANFILES = -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += rtems/score/cpu.h -include_rtems_score_HEADERS += rtems/score/cpuimpl.h -include_rtems_score_HEADERS += rtems/score/nios2.h -include_rtems_score_HEADERS += rtems/score/nios2-utility.h -include_rtems_score_HEADERS += rtems/score/nios2-count-zeros.h -include_rtems_score_HEADERS += rtems/score/cpu_asm.h -include_rtems_score_HEADERS += rtems/score/types.h -include_rtems_score_HEADERS += rtems/score/cpuatomic.h - noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = @@ -50,6 +34,6 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) all-local: $(PREINSTALL_FILES) -include $(srcdir)/preinstall.am include $(top_srcdir)/automake/local.am +include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/nios2/headers.am b/cpukit/score/cpu/nios2/headers.am new file mode 100644 index 0000000000..8cf15f1242 --- /dev/null +++ b/cpukit/score/cpu/nios2/headers.am @@ -0,0 +1,20 @@ +## This file was generated by "./boostrap -H". + +include_machinedir = $(includedir)/machine +include_machine_HEADERS = +include_machine_HEADERS += include/machine/elf_machdep.h + +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = +include_rtems_HEADERS += include/rtems/asm.h + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = +include_rtems_score_HEADERS += include/rtems/score/cpu.h +include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += include/rtems/score/nios2-count-zeros.h +include_rtems_score_HEADERS += include/rtems/score/nios2-utility.h +include_rtems_score_HEADERS += include/rtems/score/nios2.h +include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h index 3f3c108bf5..3f3c108bf5 100644 --- a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h +++ b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h diff --git a/cpukit/score/cpu/nios2/rtems/asm.h b/cpukit/score/cpu/nios2/include/rtems/asm.h index 45ccd8b050..45ccd8b050 100644 --- a/cpukit/score/cpu/nios2/rtems/asm.h +++ b/cpukit/score/cpu/nios2/include/rtems/asm.h diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h index a3f2f03d36..a3f2f03d36 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpu.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h index 81a19c8d69..81a19c8d69 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuatomic.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h index 598ee76b20..598ee76b20 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpuatomic.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuimpl.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h index 789f2badd9..789f2badd9 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpuimpl.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h index bf2390a51f..bf2390a51f 100644 --- a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h index d5eb4b3597..d5eb4b3597 100644 --- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2.h index 26d76bcbfa..26d76bcbfa 100644 --- a/cpukit/score/cpu/nios2/rtems/score/nios2.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2.h diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/cpukit/score/cpu/nios2/include/rtems/score/types.h index 23cf39419b..23cf39419b 100644 --- a/cpukit/score/cpu/nios2/rtems/score/types.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/types.h diff --git a/cpukit/score/cpu/nios2/preinstall.am b/cpukit/score/cpu/nios2/preinstall.am deleted file mode 100644 index fa07df865d..0000000000 --- a/cpukit/score/cpu/nios2/preinstall.am +++ /dev/null @@ -1,61 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/rtems/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h - -$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h - -$(PROJECT_INCLUDE)/rtems/score/nios2.h: rtems/score/nios2.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2.h - -$(PROJECT_INCLUDE)/rtems/score/nios2-utility.h: rtems/score/nios2-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h - -$(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h: rtems/score/nios2-count-zeros.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h - -$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h - -$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h - -$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h - |