summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-07 19:56:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-07-07 19:56:10 +0000
commit586f260289c210b0eebfd5bc3e9c8d30288f5882 (patch)
treecb69150036df1dc45a2aa80351a4c1c16fcf9eba /c/src/lib/libcpu
parentMoved old_exception_processing and new_exception_processing directories (diff)
downloadrtems-586f260289c210b0eebfd5bc3e9c8d30288f5882.tar.bz2
Picking up changes missed in previous commit. These changes
were needed to move exception processing to score/cpu.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r--c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am11
-rw-r--r--c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am7
2 files changed, 7 insertions, 11 deletions
diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
index 1f4affe8f4..f6b84c4969 100644
--- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
@@ -3,6 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
@@ -15,7 +16,7 @@ S_FILES = cpu_asm.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
@@ -25,12 +26,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
-##TMPINSTALL_FILES += \
-##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
-##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
-## $(INSTALL_DATA) $< $@
-
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -57,4 +52,4 @@ CLEANDIRS = ../o-optimize ../o-debug ../o-profile
EXTRA_DIST = $(C_FILES) $(S_FILES)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
index 92f3fee811..1ad0b1bde9 100644
--- a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
@@ -3,6 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
# C source names
C_FILES = cpu.c
@@ -17,7 +18,7 @@ S_FILES = cpu_asm.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
@@ -40,7 +41,7 @@ $(PROJECT_INCLUDE)/rtems/score/%: %
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
-REL = ../$(ARCH)/rtems-cpu.rel
+REL = $(ARCH)/rtems-cpu.rel
$(REL): $(C_O_FILES) $(S_O_FILES)
test -d ../$(ARCH) || mkdir ../$(ARCH)
@@ -54,4 +55,4 @@ UNUSED_FILES = irq_stub.S
EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES)
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../../automake/local.am