From b0f78e882aa2a41ba2dfd06284d290c0d1f20513 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 22 Jan 2002 17:55:27 +0000 Subject: 2002-01-21 Ralf Corsepius * rtems/Makefile.am: New. * rtems/.cvsignore: New. * rtems/score/Makefile.am: New. * rtems/score/.cvsignore: New. * rtems/score/ppc.h: Relocated from shared/. * rtems/score/ppctypes.h: Relocated from shared/. * asm.h: Relocated from shared/. * shared/Makefile.am: Removed. * shared/asm.h: Removed. * shared/ppc.h: Removed. * shared/ppctypes.h: Removed. * shared/.cvsignore: Removed. * Makefile.am: Reflect changes above. * configure.ac: Reflect changes above. --- cpukit/score/cpu/powerpc/ChangeLog | 17 +++++++++++++++ cpukit/score/cpu/powerpc/Makefile.am | 29 +++++++++++++++++++++++-- cpukit/score/cpu/powerpc/configure.ac | 3 ++- cpukit/score/cpu/powerpc/rtems/.cvsignore | 2 ++ cpukit/score/cpu/powerpc/rtems/score/.cvsignore | 2 ++ 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 cpukit/score/cpu/powerpc/rtems/.cvsignore create mode 100644 cpukit/score/cpu/powerpc/rtems/score/.cvsignore (limited to 'cpukit') diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 6a73757211..0e7d162091 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,20 @@ +2002-01-21 Ralf Corsepius + + * rtems/Makefile.am: New. + * rtems/.cvsignore: New. + * rtems/score/Makefile.am: New. + * rtems/score/.cvsignore: New. + * rtems/score/ppc.h: Relocated from shared/. + * rtems/score/ppctypes.h: Relocated from shared/. + * asm.h: Relocated from shared/. + * shared/Makefile.am: Removed. + * shared/asm.h: Removed. + * shared/ppc.h: Removed. + * shared/ppctypes.h: Removed. + * shared/.cvsignore: Removed. + * Makefile.am: Reflect changes above. + * configure.ac: Reflect changes above. + 2001-11-28 Joel Sherrill , This was tracked as PR91. diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 5868533796..11ca547fc2 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -2,10 +2,35 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = shared +SUBDIRS = rtems + +include_HEADERS = asm.h + +include $(top_srcdir)/../../../../../../automake/multilib.am +include $(top_srcdir)/../../../../../../automake/compile.am +include $(top_srcdir)/../../../../../../automake/lib.am + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +# $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o +# $(INSTALL_DATA) $< $@ + +# $(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) \ + $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/powerpc/configure.ac b/cpukit/score/cpu/powerpc/configure.ac index 6b2fabddb7..ac055639bf 100644 --- a/cpukit/score/cpu/powerpc/configure.ac +++ b/cpukit/score/cpu/powerpc/configure.ac @@ -27,5 +27,6 @@ RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -shared/Makefile]) +rtems/Makefile +rtems/score/Makefile]) AC_OUTPUT diff --git a/cpukit/score/cpu/powerpc/rtems/.cvsignore b/cpukit/score/cpu/powerpc/rtems/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/cpukit/score/cpu/powerpc/rtems/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/cpukit/score/cpu/powerpc/rtems/score/.cvsignore b/cpukit/score/cpu/powerpc/rtems/score/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/cpukit/score/cpu/powerpc/rtems/score/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in -- cgit v1.2.3