summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-22 17:55:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-22 17:55:27 +0000
commitb0f78e882aa2a41ba2dfd06284d290c0d1f20513 (patch)
tree0da404e2a22a66e3cbfa6ffa46e65076c0cbe937 /cpukit
parentfb56a379e4c38928b7e0bee8825ac0f5e0a3ac22 (diff)
downloadrtems-b0f78e882aa2a41ba2dfd06284d290c0d1f20513.tar.bz2
2002-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/powerpc/ChangeLog17
-rw-r--r--cpukit/score/cpu/powerpc/Makefile.am29
-rw-r--r--cpukit/score/cpu/powerpc/configure.ac3
-rw-r--r--cpukit/score/cpu/powerpc/rtems/.cvsignore2
-rw-r--r--cpukit/score/cpu/powerpc/rtems/score/.cvsignore2
5 files changed, 50 insertions, 3 deletions
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 <corsepiu@faw.uni-ulm.de>
+
+ * 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 <joel@OARcorp.com>,
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