From 7a01fba12790e07ac0754717471e98569f26c230 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 30 Jan 2002 14:34:00 +0000 Subject: 2002-01-28 Ralf Corsepius * rtems/Makefile.am: Removed. * rtems/score/Makefile.am: Removed. * configure.ac: Reflect changes above. * Makefile.am: Reflect changes above. --- cpukit/score/cpu/or16/Makefile.am | 43 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'cpukit/score/cpu/or16/Makefile.am') diff --git a/cpukit/score/cpu/or16/Makefile.am b/cpukit/score/cpu/or16/Makefile.am index 7c1cecb6e5..3867f51d6d 100644 --- a/cpukit/score/cpu/or16/Makefile.am +++ b/cpukit/score/cpu/or16/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/or16types.h \ + rtems/score/or16.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 -- cgit v1.2.3