From c9a1edfc981c656704e3da1be18fd88c133beb02 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 15 Dec 2003 17:45:07 +0000 Subject: 2003-12-15 Ralf Corsepius * shared/include/Makefile.am: Remove. * shared/src/Makefile.am: Remove. * shared/Makefile.am: Merge-in Makefile.ams above. * configure.ac: Reflect changes above. --- c/src/lib/libcpu/powerpc/ChangeLog | 7 ++ c/src/lib/libcpu/powerpc/configure.ac | 2 - c/src/lib/libcpu/powerpc/shared/Makefile.am | 94 +++++++++++++++++++++- .../lib/libcpu/powerpc/shared/include/Makefile.am | 67 --------------- c/src/lib/libcpu/powerpc/shared/src/Makefile.am | 48 ----------- 5 files changed, 99 insertions(+), 119 deletions(-) delete mode 100644 c/src/lib/libcpu/powerpc/shared/include/Makefile.am delete mode 100644 c/src/lib/libcpu/powerpc/shared/src/Makefile.am (limited to 'c/src/lib/libcpu/powerpc') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index b2de23238f..2290f974fa 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2003-12-15 Ralf Corsepius + + * shared/include/Makefile.am: Remove. + * shared/src/Makefile.am: Remove. + * shared/Makefile.am: Merge-in Makefile.ams above. + * configure.ac: Reflect changes above. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 48d30748bf..ad80b7ad3d 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -79,7 +79,5 @@ mpc8260/exceptions/Makefile mpc8260/mmu/Makefile mpc8260/cpm/Makefile shared/Makefile -shared/include/Makefile -shared/src/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index c213e23c20..d787211282 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -2,7 +2,97 @@ ## $Id$ ## -SUBDIRS = include src +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am + +# include + +libcpuspec_C_FILES = include/cpuIdent.c +libcpuspec_OBJS = \ + $(libcpuspec_C_FILES:include/%.c=include/$(ARCH)/%.$(OBJEXT)) + +include_libcpudir = $(includedir)/libcpu + +include_libcpu_HEADERS = include/spr.h include/io.h include/mmu.h \ + include/page.h include/byteorder.h include/pgtable.h include/cpuIdent.h + +include/$(ARCH)/$(dirstamp): + @$(mkdir_p) include/$(ARCH) + @: > include/$(ARCH)/$(dirstamp) +include/$(ARCH)/%.$(OBJEXT): include/%.c include/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +include/$(ARCH)/libcpuspec.a: $(libcpuspec_OBJS) + $(make-library) +CLEANDIRS = include/o-optimize include/o-debug + +EXTRA_DIST = libcpuspec_C_FILES + +# src + +src_C_FILES = src/cache.c src/stack.c + +common_C_FILES = ../../shared/src/cache_aligned_malloc.c +common_C_FILES += ../../shared/src/cache_manager.c + +src_O_FILES = $(src_C_FILES:src/%.c=src/$(ARCH)/%.$(OBJEXT)) +common_O_FILES = \ + $(common_C_FILES:../../shared/src/%.c=src/$(ARCH)/%.$(OBJEXT)) + +src/$(ARCH)/$(dirstamp): + @$(mkdir_p) src/$(ARCH) + @: > src/$(ARCH)/$(dirstamp) +src/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c src/$(ARCH)/$(dirstamp) + ${COMPILE} -I$(srcdir)/src -o $@ -c $< +src/$(ARCH)/%.$(OBJEXT): src/%.c src/$(ARCH)/$(dirstamp) + ${COMPILE} -I$(srcdir)/src -o $@ -c $< +CLEANDIRS += src/o-optimize src/o-debug + +noinst_HEADERS = src/cache_.h +include_libcpu_HEADERS += src/stackTrace.h +include_libcpu_HEADERS += ../../shared/include/cache.h + +all-local: $(PREINSTALL_FILES) include/$(ARCH)/libcpuspec.a $(src_O_FILES) $(common_O_FILES) + +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/libcpu/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu + @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + +$(PROJECT_INCLUDE)/libcpu/spr.h: include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h + +$(PROJECT_INCLUDE)/libcpu/io.h: include/io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h + +$(PROJECT_INCLUDE)/libcpu/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h + +$(PROJECT_INCLUDE)/libcpu/page.h: include/page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h + +$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h + +$(PROJECT_INCLUDE)/libcpu/pgtable.h: include/pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h + +$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: include/cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h + +$(PROJECT_INCLUDE)/libcpu/stackTrace.h: src/stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h + +$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am deleted file mode 100644 index f31057b7b0..0000000000 --- a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -## -## $Id$ -## - -C_FILES = cpuIdent.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = spr.h io.h mmu.h page.h byteorder.h pgtable.h \ - cpuIdent.h - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -LIB = $(ARCH)/libcpuspec.a - -# -# (OPTIONAL) Add local stuff here using += -# - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(PREINSTALL_FILES) $(OBJS) $(LIB) - -.PRECIOUS: $(LIB) - -EXTRA_DIST = cpuIdent.c - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/spr.h: spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h - -$(PROJECT_INCLUDE)/libcpu/io.h: io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h - -$(PROJECT_INCLUDE)/libcpu/mmu.h: mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h - -$(PROJECT_INCLUDE)/libcpu/page.h: page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h - -$(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h - -$(PROJECT_INCLUDE)/libcpu/pgtable.h: pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h - -$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am deleted file mode 100644 index 5bf5b05af0..0000000000 --- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared/src - -C_FILES = cache.c cache_aligned_malloc.c cache_manager.c stack.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = cache_.h cache.h stackTrace.h - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -AM_CPPFLAGS += -I$(srcdir) - -cache.h: $(top_srcdir)/../shared/include/cache.h - cp $< $@ - -all-local: $(PREINSTALL_FILES) $(OBJS) - -CLEANFILES = cache.h - -EXTRA_DIST = cache.c cache_.h - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache_.h: cache_.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache_.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache_.h - -$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - -$(PROJECT_INCLUDE)/libcpu/stackTrace.h: stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3