2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mpc6xx/clock/Makefile.am: Remove.
	* mpc6xx/exceptions/Makefile.am: Remove.
	* mpc6xx/mmu/Makefile.am: Remove.
	* mpc6xx/timer/Makefile.am: Remove.
	* mpc6xx/wrapup/Makefile.am: Remove.
	* mpc6xx/Makefile.am: Merge-in Makefile.ams above.
This commit is contained in:
Ralf Corsepius
2003-12-16 07:44:19 +00:00
parent 952281eddd
commit 90251c3e08
7 changed files with 128 additions and 184 deletions

View File

@@ -1,3 +1,12 @@
2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mpc6xx/clock/Makefile.am: Remove.
* mpc6xx/exceptions/Makefile.am: Remove.
* mpc6xx/mmu/Makefile.am: Remove.
* mpc6xx/timer/Makefile.am: Remove.
* mpc6xx/wrapup/Makefile.am: Remove.
* mpc6xx/Makefile.am: Merge-in Makefile.ams above.
2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mpc8260/clock/Makefile.am: Remove.

View File

@@ -2,7 +2,124 @@
## $Id$
##
SUBDIRS = exceptions mmu clock timer wrapup
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
EXTRA_DIST =
CLEANDIRS =
noinst_DATA =
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = exceptions/raw_exception.h
# exceptions
exceptions_C_FILES = exceptions/raw_exception.c
exceptions_S_FILES = exceptions/asm_utils.S
EXTRA_DIST += $(exceptions_C_FILES) $(exceptions_S_FILES)
exceptions_rel_OBJECTS = $(exceptions_C_FILES:exceptions/%.c=exceptions/$(ARCH)/%.$(OBJEXT)) \
$(exceptions_S_FILES:exceptions/%.S=exceptions/$(ARCH)/%.$(OBJEXT))
exceptions/$(ARCH)/$(dirstamp):
@$(mkdir_p) exceptions/$(ARCH)
@: > exceptions/$(ARCH)/$(dirstamp)
exceptions/$(ARCH)/%.$(OBJEXT): exceptions/%.c exceptions/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
exceptions/$(ARCH)/%.$(OBJEXT): exceptions/%.S exceptions/$(ARCH)/$(dirstamp)
${CCASCOMPILE} -o $@ -c $<
exceptions/$(ARCH)/exceptions.rel: $(exceptions_rel_OBJECTS)
$(make-rel)
CLEANDIRS += exceptions/o-optimize exceptions/o-debug
noinst_DATA += exceptions/$(ARCH)/exceptions.rel
# mmu
include_libcpu_HEADERS += mmu/bat.h mmu/pte121.h
mmu_C_FILES = mmu/bat.c mmu/pte121.c
mmu_S_FILES = mmu/mmuAsm.S
EXTRA_DIST += $(mmu_C_FILES) $(mmu_S_FILES)
mmu_rel_OBJECTS = $(mmu_C_FILES:mmu/%.c=mmu/$(ARCH)/%.$(OBJEXT)) \
$(mmu_S_FILES:mmu/%.S=mmu/$(ARCH)/%.$(OBJEXT))
mmu/$(ARCH)/$(dirstamp):
@$(mkdir_p) mmu/$(ARCH)
@: > mmu/$(ARCH)/$(dirstamp)
mmu/$(ARCH)/%.$(OBJEXT): mmu/%.c mmu/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
mmu/$(ARCH)/%.$(OBJEXT): mmu/%.S mmu/$(ARCH)/$(dirstamp)
${CCASCOMPILE} -o $@ -c $<
mmu/$(ARCH)/mmu.rel: $(mmu_rel_OBJECTS)
$(make-rel)
CLEANDIRS += mmu/o-optimize mmu/o-debug
noinst_DATA += mmu/$(ARCH)/mmu.rel
# clock
include_libcpu_HEADERS += clock/c_clock.h
clock_C_FILES = clock/c_clock.c
EXTRA_DIST += $(clock_C_FILES)
clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=clock/$(ARCH)/%.$(OBJEXT))
clock/$(ARCH)/$(dirstamp):
@$(mkdir_p) clock/$(ARCH)
@: > clock/$(ARCH)/$(dirstamp)
clock/$(ARCH)/%.$(OBJEXT): clock/%.c clock/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
clock/$(ARCH)/clock.rel: $(clock_rel_OBJECTS)
$(make-rel)
CLEANDIRS += clock/o-optimize clock/o-debug
noinst_DATA += clock/$(ARCH)/clock.rel
# timer
timer_C_FILES = timer/timer.c
EXTRA_DIST += $(timer_C_FILES)
timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=timer/$(ARCH)/%.$(OBJEXT))
timer/$(ARCH)/$(dirstamp):
@$(mkdir_p) timer/$(ARCH)
@: > timer/$(ARCH)/$(dirstamp)
timer/$(ARCH)/%.$(OBJEXT): timer/%.c timer/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
timer/$(ARCH)/timer.rel: $(timer_rel_OBJECTS)
$(make-rel)
CLEANDIRS += timer/o-optimize timer/o-debug
noinst_DATA += timer/$(ARCH)/timer.rel
## wrapup
OBJS = $(exception_OBJECTS)
OBJS += $(mmu_OBJECTS)
$(ARCH)/libcpuspec.a: ${OBJS}
$(make-library)
noinst_DATA += $(ARCH)/libcpuspec.a
## ----
all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
$(PROJECT_INCLUDE)/libcpu/bat.h: mmu/bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h
$(PROJECT_INCLUDE)/libcpu/pte121.h: mmu/pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
$(PROJECT_INCLUDE)/libcpu/c_clock.h: clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,34 +0,0 @@
##
## $Id$
##
C_FILES = c_clock.c
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = c_clock.h
c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
all-local: $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
EXTRA_DIST = c_clock.c c_clock.h
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/c_clock.h: c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,44 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/exceptions.rel
C_FILES = raw_exception.c
S_FILES = asm_utils.S
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = raw_exception.h
exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
$(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(exceptions_rel_OBJECTS)
$(make-rel)
all-local: $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/raw_exception.h: raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,48 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/mmu.rel
C_FILES = bat.c pte121.c
S_FILES = mmuAsm.S
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = bat.h pte121.h
mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
$(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(mmu_rel_OBJECTS)
$(make-rel)
all-local: $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = bat.c bat.h mmuAsm.S pte121.c pte121.h
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/bat.h: bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h
$(PROJECT_INCLUDE)/libcpu/pte121.h: pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,27 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/timer.rel
C_FILES = timer.c
timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(timer_rel_OBJECTS)
$(make-rel)
all-local: $(timer_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = timer.c
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,29 +0,0 @@
##
## $Id$
##
# PROC_SPECIFIC_O_FILES = exceptions mmu clock
PROC_SPECIFIC_O_FILES = exceptions mmu
GENERIC_FILES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(PROC_SPECIFIC_O_FILES), \
../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT)) $(foreach piece, \
$(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libcpuspec.a
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(LIB): ${OBJS}
echo $(OBJ)
$(make-library)
cp $(LIB) ..
all-local: $(LIB)
include $(top_srcdir)/../../../automake/local.am