diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-11-23 10:36:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-11-23 10:36:05 +0000 |
| commit | d6a444d3b3707ceba558bfbd276289de152b9b69 (patch) | |
| tree | 158158d6b40c6393d724207d6fd6f482a1a62573 /cpukit/score/cpu/i960 | |
| parent | 2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d6a444d3b3707ceba558bfbd276289de152b9b69.tar.bz2 | |
2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Don't use gmake rules for preinstallation.
Diffstat (limited to 'cpukit/score/cpu/i960')
| -rw-r--r-- | cpukit/score/cpu/i960/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/i960/Makefile.am | 41 |
2 files changed, 27 insertions, 18 deletions
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index 4a51f155eb..dac2a20a13 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/ChangeLog @@ -1,3 +1,7 @@ +2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Don't use gmake rules for preinstallation. + 2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index c0376aea65..bb44d0133e 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/Makefile.am @@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - include_HEADERS = asm.h -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = \ - rtems/score/cpu.h \ - rtems/score/i960.h \ +include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i960.h \ rtems/score/types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) C_FILES = cpu.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) @@ -47,4 +30,26 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \ EXTRA_DIST = cpu.c cpu_asm.S i960RP.h +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/asm.h: asm.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h + +$(PROJECT_INCLUDE)/rtems/score: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score + +$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h + +$(PROJECT_INCLUDE)/rtems/score/i960.h: rtems/score/i960.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/i960.h + +$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h + include $(top_srcdir)/../../../automake/local.am |