From f439d61ed7d54eba50726df821aa85a7774bcb07 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 15:26:36 +0000 Subject: 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Remove. * configure.ac: Remove wrapup. * shared/Makefile.am: Use automake compilation rules. Build *.rels. --- c/src/lib/libcpu/powerpc/ChangeLog | 7 ++ c/src/lib/libcpu/powerpc/Makefile.am | 2 +- c/src/lib/libcpu/powerpc/configure.ac | 2 +- c/src/lib/libcpu/powerpc/shared/Makefile.am | 118 ++++++++++++++++------------ c/src/lib/libcpu/powerpc/wrapup/.cvsignore | 2 - c/src/lib/libcpu/powerpc/wrapup/Makefile.am | 29 ------- 6 files changed, 75 insertions(+), 85 deletions(-) delete mode 100644 c/src/lib/libcpu/powerpc/wrapup/.cvsignore delete mode 100644 c/src/lib/libcpu/powerpc/wrapup/Makefile.am (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 2e3bb5670e..45d1f173c4 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2004-01-30 Ralf Corsepius + + * wrapup/Makefile.am: Remove. + * configure.ac: Remove wrapup. + * shared/Makefile.am: Use automake compilation rules. + Build *.rels. + 2004-01-21 Ralf Corsepius * configure.ac: Require automake >= 1.8.2. diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index c1ca8af8b6..28e40c4441 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -8,7 +8,7 @@ include_rtems_powerpcdir = $(includedir)/rtems/powerpc include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \ rtems/powerpc/debugmod.h -SUBDIRS = shared mpc505 mpc6xx mpc8260 mpc8xx ppc403 wrapup +SUBDIRS = shared mpc505 mpc6xx mpc8260 mpc8xx ppc403 all-local: $(TMPINSTALL_FILES) diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index bf032364fb..482d24ecd3 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -55,5 +55,5 @@ ppc403/Makefile mpc6xx/Makefile mpc8260/Makefile shared/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 6bdbf3b797..30deb0983e 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -2,58 +2,72 @@ ## $Id$ ## +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am # include if shared -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 = $(top_srcdir)/../shared/src/cache_aligned_malloc.c -common_C_FILES += $(top_srcdir)/../shared/src/cache_manager.c - -src_O_FILES = $(src_C_FILES:src/%.c=src/$(ARCH)/%.$(OBJEXT)) -common_O_FILES = \ - $(common_C_FILES:$(top_srcdir)/../shared/src/%.c=src/$(ARCH)/%.$(OBJEXT)) - -src/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/$(ARCH) - @: > src/$(ARCH)/$(dirstamp) -src/$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../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 = include/io.h include/mmu.h include/page.h \ + include/byteorder.h include/pgtable.h + +EXTRA_PROGRAMS += cpuIdent.rel +CLEANFILES += cpuIdent.rel +cpuIdent_rel_SOURCES = include/cpuIdent.c include/cpuIdent.h +cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += cpuIdent_g.rel +CLEANFILES += cpuIdent_g.rel +cpuIdent_g_rel_SOURCES = $(cpuIdent_rel_SOURCES) +cpuIdent_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +cpuIdent_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += cpuIdent$(LIB_VARIANT).rel +include_libcpu_HEADERS += include/cpuIdent.h + +## cache +EXTRA_PROGRAMS += cache.rel +CLEANFILES += cache.rel +cache_rel_SOURCES = src/cache.c src/cache_.h \ + ../../shared/src/cache_aligned_malloc.c ../../shared/src/cache_manager.c \ + ../../shared/include/cache.h +cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/src +cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += cache_g.rel +CLEANFILES += cache_g.rel +cache_g_rel_SOURCES = $(cache_rel_SOURCES) +cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/src +cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += cache$(LIB_VARIANT).rel +include_libcpu_HEADERS += ../../shared/include/cache.h + +## stack +EXTRA_PROGRAMS += stack.rel +CLEANFILES += stack.rel +stack_rel_SOURCES = src/stack.c include/spr.h src/stackTrace.h +stack_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +stack_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += stack_g.rel +CLEANFILES += stack_g.rel +stack_g_rel_SOURCES = $(stack_rel_SOURCES) +stack_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +stack_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += stack$(LIB_VARIANT).rel +include_libcpu_HEADERS += include/spr.h include_libcpu_HEADERS += src/stackTrace.h -include_libcpu_HEADERS += $(top_srcdir)/../shared/include/cache.h - -all-local: $(PREINSTALL_FILES) include/$(ARCH)/libcpuspec.a $(src_O_FILES) $(common_O_FILES) endif +all-local: $(PREINSTALL_FILES) + PREINSTALL_DIRS = PREINSTALL_FILES = @@ -63,10 +77,6 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) PREINSTALL_DIRS += $(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 @@ -91,16 +101,20 @@ $(PROJECT_INCLUDE)/libcpu/cpuIdent.h: include/cpuIdent.h $(PROJECT_INCLUDE)/libc $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.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 + +$(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/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: $(top_srcdir)/../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h endif -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/wrapup/.cvsignore b/c/src/lib/libcpu/powerpc/wrapup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libcpu/powerpc/wrapup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am deleted file mode 100644 index 3216ca2cdd..0000000000 --- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## -## $Id$ -## - -GENERIC_FILES = shared - -# Use two variables so that I can make two ar command. -# So far FAMILY_OBJS is empty and ar dislike it... -CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) -FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.$(OBJEXT) \ - ../shared/*/$(ARCH)/*.$(OBJEXT) ../mpc6xx/*/$(ARCH)/*.$(OBJEXT)) - -LIB = $(ARCH)/libcpu.a - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -libcpu_a_OBJECTS = $(CPU_SPECIFIC_OBJS) $(FAMILY_OBJS) - -$(LIB): $(libcpu_a_OBJECTS) - ${make-library} - -all-local: $(LIB) - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3