diff options
4 files changed, 14 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am index 1f4affe8f4..f6b84c4969 100644 --- a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am +++ b/c/src/lib/libbsp/powerpc/support/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/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am index 92f3fee811..1ad0b1bde9 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am +++ b/c/src/lib/libbsp/powerpc/support/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 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 |