diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-02-01 14:11:39 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-02-01 14:11:39 +0000 |
commit | 6d41a8747caf7d7139a23a32bcb0cf155295d663 (patch) | |
tree | 792f8dca23193de6c04632caaa9f189eb03aa584 /c/src/exec | |
parent | 2001-01-31 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-6d41a8747caf7d7139a23a32bcb0cf155295d663.tar.bz2 |
2002-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect 2002-01-23 changes.
Diffstat (limited to 'c/src/exec')
-rw-r--r-- | c/src/exec/score/cpu/sh/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/exec/score/cpu/sh/Makefile.am | 33 |
2 files changed, 26 insertions, 11 deletions
diff --git a/c/src/exec/score/cpu/sh/ChangeLog b/c/src/exec/score/cpu/sh/ChangeLog index 455fa1d663..c61a56e053 100644 --- a/c/src/exec/score/cpu/sh/ChangeLog +++ b/c/src/exec/score/cpu/sh/ChangeLog @@ -2,6 +2,10 @@ * Makefile.am: Reflect 2002-01-23 changes. +2002-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Reflect 2002-01-23 changes. + 2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * rtems/Makefile.am: Removed. diff --git a/c/src/exec/score/cpu/sh/Makefile.am b/c/src/exec/score/cpu/sh/Makefile.am index eac9d86fde..af712b28b4 100644 --- a/c/src/exec/score/cpu/sh/Makefile.am +++ b/c/src/exec/score/cpu/sh/Makefile.am @@ -2,25 +2,36 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -SUBDIRS = rtems - -include_HEADERS= asm.h +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ +$(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/shtypes.h \ + rtems/score/sh.h \ + rtems/score/sh_io.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -32,7 +43,8 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) +$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o @@ -41,7 +53,6 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c rtems.c +EXTRA_DIST = cpu.c rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am |