diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-30 14:34:00 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-30 14:34:00 +0000 |
commit | 7a01fba12790e07ac0754717471e98569f26c230 (patch) | |
tree | dad9a96fd97790733a72558c0c7f47add8ecc81c /cpukit/score/cpu/or32 | |
parent | 2002-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-7a01fba12790e07ac0754717471e98569f26c230.tar.bz2 |
2002-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/Makefile.am: Removed.
* rtems/score/Makefile.am: Removed.
* configure.ac: Reflect changes above.
* Makefile.am: Reflect changes above.
Diffstat (limited to 'cpukit/score/cpu/or32')
-rw-r--r-- | cpukit/score/cpu/or32/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/score/cpu/or32/Makefile.am | 43 | ||||
-rw-r--r-- | cpukit/score/cpu/or32/configure.ac | 4 |
3 files changed, 35 insertions, 19 deletions
diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog index 1fac86bccd..8e33250f37 100644 --- a/cpukit/score/cpu/or32/ChangeLog +++ b/cpukit/score/cpu/or32/ChangeLog @@ -1,3 +1,10 @@ +2002-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Add multilib support. diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am index 7c1cecb6e5..d50f189044 100644 --- a/cpukit/score/cpu/or32/Makefile.am +++ b/cpukit/score/cpu/or32/Makefile.am @@ -5,35 +5,47 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c cpu_asm.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -REL = $(ARCH)/rtems-cpu.rel - -rtems_cpu_rel_OBJECTS = $(C_O_FILES) - 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)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(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/or32types.h \ + rtems/score/or32.h \ + rtems/score/cpu_asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c cpu_asm.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -43,5 +55,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.c rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/or32/configure.ac b/cpukit/score/cpu/or32/configure.ac index a16095b01d..bb7f948954 100644 --- a/cpukit/score/cpu/or32/configure.ac +++ b/cpukit/score/cpu/or32/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT |