diff options
29 files changed, 73 insertions, 58 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 dc66f32648..62f495e867 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,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) @@ -16,6 +15,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/compile.am include $(top_srcdir)/../../../../../automake/lib.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 1ad0b1bde9..2ab7117b4d 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,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal # C source names C_FILES = cpu.c @@ -18,6 +17,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/compile.am include $(top_srcdir)/../../../../../automake/lib.am PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ @@ -47,7 +47,8 @@ $(REL): $(C_O_FILES) $(S_O_FILES) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o \ + $(TMPINSTALL_FILES) CLEANDIRS = ../o-optimize ../o-debug ../o-profile diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index c945d74b22..15b11b8fb6 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,18 @@ +2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * mpc505/timer/Makefile.am, mpc505/vectors/Makefile.am, + mpc6xx/clock/Makefile.am, mpc6xx/exceptions/Makefile.am, + mpc6xx/mmu/Makefile.am, mpc6xx/timer/Makefile.am, + mpc6xx/wrapup/Makefile.am, ppc403/clock/Makefile.am, + ppc403/console/Makefile.am, ppc403/ictrl/Makefile.am, + ppc403/timer/Makefile.am, ppc403/vectors/Makefile.am, + shared/include/Makefile.am, shared/src/Makefile.am, + wrapup/Makefile.am, mpc8xx/clock/Makefile.am, + mpc8xx/console-generic/Makefile.am, mpc8xx/cpm/Makefile.am, + mpc8xx/mmu/Makefile.am, mpc8xx/timer/Makefile.am, + mpc8xx/vectors/Makefile.am, new_exception_processing/Makefile.am, + old_exception_processing/Makefile.am: Include compile.am + 2000-08-11 Charles-Antoine Gauthier <charles.gauthier@nrc.ca> * mpc8xx/console-generic/console-generic.c: diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am index 65edc98d9f..b36d2a0e7a 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am @@ -11,6 +11,7 @@ C_FILES = timer.c timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am index 0f5a304686..cf5e302c77 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am @@ -16,6 +16,7 @@ S_FILES = vectors.S align_h.S vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am index 7ac55df4a7..d6b82f58d8 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am @@ -11,6 +11,7 @@ H_FILES = c_clock.h c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am $(PROJECT_INCLUDE)/libcpu: diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am index ea6b94b5b5..d79699810d 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am @@ -16,6 +16,7 @@ exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \ $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am $(PROJECT_INCLUDE)/libcpu: diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am index c64da3def0..2602ba765c 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am @@ -15,6 +15,7 @@ H_FILES = bat.h mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am $(PROJECT_INCLUDE)/libcpu: diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am index 65edc98d9f..b36d2a0e7a 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am @@ -11,6 +11,7 @@ C_FILES = timer.c timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am index 36950229a9..b98cd90e72 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am @@ -15,6 +15,7 @@ OBJS = \ LIB = $(ARCH)/libcpuspec.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am index 3d9bd3de3b..481921db1c 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am index ff64e6e6e2..78b2d09d9a 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,14 +12,13 @@ C_FILES = clock.c clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am index 4907257c76..bb760de630 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,14 +12,13 @@ C_FILES = console-generic.c console_generic_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(console_generic_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am index 1c9af7e4a3..0acf21ae32 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,14 +12,13 @@ C_FILES = cp.c dpram.c clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) @@ -28,11 +27,3 @@ all-local: ${ARCH} $(PGM) EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../../automake/local.am - - - - - - - - diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am index eb400375c0..39c709fe92 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,10 +9,9 @@ MPC8XX_H_FILES = console.h cpm.h mmu.h noinst_HEADERS = $(H_FILES) $(MPC8XX_H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/mpc8xx \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(MPC8XX_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc8xx/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(MPC8XX_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc8xx/%.h) $(PROJECT_INCLUDE)/mpc8xx: $(mkinstalldirs) $@ @@ -23,6 +22,6 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/mpc8xx/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am index 322c3fca75..0b3a74def9 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,14 +12,13 @@ C_FILES = mmu.c clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am index 39f0c9f3b6..7886c6d3d3 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,14 +12,13 @@ C_FILES = timer.c timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/vectors/Makefile.am index d82045bf32..7714e52c0c 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources @@ -15,14 +16,13 @@ S_FILES = vectors.S align_h.S vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(vectors_rel_OBJECTS) $(make-rel) 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 dc66f32648..62f495e867 100644 --- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am +++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) @@ -16,6 +15,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/compile.am include $(top_srcdir)/../../../../../automake/lib.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 1ad0b1bde9..2ab7117b4d 100644 --- a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am +++ b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal # C source names C_FILES = cpu.c @@ -18,6 +17,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/compile.am include $(top_srcdir)/../../../../../automake/lib.am PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ @@ -47,7 +47,8 @@ $(REL): $(C_O_FILES) $(S_O_FILES) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o \ + $(TMPINSTALL_FILES) CLEANDIRS = ../o-optimize ../o-debug ../o-profile diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am index f8b46ecc12..21b27ba1b3 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am @@ -11,6 +11,7 @@ C_FILES = clock.c clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am index 4289321d14..923bbe4886 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am @@ -11,6 +11,7 @@ C_FILES = console.c console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am index efefed93e9..2c60b11cc9 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am @@ -13,6 +13,7 @@ H_FILES = ictrl.h ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am $(PROJECT_INCLUDE): diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am index 65edc98d9f..b36d2a0e7a 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am @@ -11,6 +11,7 @@ C_FILES = timer.c timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am index ce95f92721..4d17fa3db9 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am @@ -12,6 +12,7 @@ S_FILES = vectors.S align_h.S vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index 87a05a3113..e276ed9235 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am index edbb18ae0c..3fc822d555 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am @@ -12,6 +12,7 @@ H_FILES = cpu.h spr.h io.h mmu.h page.h byteorder.h pgtable.h OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am LIB = $(ARCH)/libcpuspec.a diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am index d94c4388c9..ca04231141 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal VPATH = @srcdir@:@srcdir@/../../../shared/src @@ -11,11 +10,12 @@ C_FILES = cache.c cache_aligned_malloc.c cache_manager.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = cache_.h -INSTALLED_H_FILES = +INSTALLED_H_FILES = OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am AM_CPPFLAGS += -I$(srcdir) @@ -29,10 +29,11 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h $(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu $(PROJECT_INCLUDE)/libcpu/cache.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ + $(PROJECT_INCLUDE)/libcpu/cache.h all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) -EXTRA_DIST = cache.c cache_.h +EXTRA_DIST = cache.c cache_.h include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am index c45bfc418d..92f86b9870 100644 --- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am +++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am @@ -10,14 +10,12 @@ GENERIC_FILES = shared # So far FAMILY_OBJS is empty and ar dislike it... CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) FAMILY_OBJS = \ - $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o \ - ../old_exception_processing/*/$(ARCH)/*.o \ - ../new_exception_processing/*/$(ARCH)/*.o \ - ../mpc6xx/*/$(ARCH)/*.o) + $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../old_exception_processing/*/$(ARCH)/*.o ../new_exception_processing/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o) LIB = $(ARCH)/libcpu.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am # |