From 1d90b6d1cd8861edfeaf677178ccc139a7d29240 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 16:43:12 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in dlentry/Makefile.am, startup/Makefile.am. Use automake compilation rules. * dlentry/Makefile.am, startup/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above. --- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 8 ++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 54 ++++++++++++++++++++-- c/src/lib/libbsp/powerpc/gen405/configure.ac | 2 - c/src/lib/libbsp/powerpc/gen405/dlentry/.cvsignore | 2 - .../lib/libbsp/powerpc/gen405/dlentry/Makefile.am | 30 ------------ c/src/lib/libbsp/powerpc/gen405/startup/.cvsignore | 2 - .../lib/libbsp/powerpc/gen405/startup/Makefile.am | 49 -------------------- c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 7 +-- 8 files changed, 61 insertions(+), 93 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/gen405/dlentry/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/gen405/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 6034a5c3ff..439e23ad7f 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,11 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in dlentry/Makefile.am, startup/Makefile.am. Use + automake compilation rules. + * dlentry/Makefile.am, startup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + * wrapup/Makefile.am: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index b157af5ca0..9103ddfb7e 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -6,24 +6,72 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . dlentry startup @exceptions@ wrapup +SUBDIRS = . @exceptions@ wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +dist_project_lib_DATA += startup/linkcmds startup/linkcmds.dl + +EXTRA_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/main.c ../../shared/sbrk.c startup/setvec.c \ + ../../shared/gnatinstallhandler.c +startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += startup_g.rel +CLEANFILES += startup_g.rel +startup_g_rel_SOURCES = $(startup_rel_SOURCES) +startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += startup$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += dlentry.rel +CLEANFILES += dlentry.rel +dlentry_rel_SOURCES = dlentry/dlentry.S +dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += dlentry_g.rel +CLEANFILES += dlentry_g.rel +dlentry_g_rel_SOURCES = $(dlentry_rel_SOURCES) +dlentry_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +dlentry_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += dlentry$(LIB_VARIANT).rel + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds + +$(PROJECT_LIB)/linkcmds.dl: startup/linkcmds.dl $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.dl +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.dl + +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index 25c4b1819d..f85c210444 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -34,8 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -dlentry/Makefile -startup/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/gen405/dlentry/.cvsignore b/c/src/lib/libbsp/powerpc/gen405/dlentry/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/dlentry/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am deleted file mode 100644 index 3e8d1ce7db..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/dlentry.rel - -S_FILES = dlentry.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = dlentry.S - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/.cvsignore b/c/src/lib/libbsp/powerpc/gen405/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am deleted file mode 100644 index 301b277a1b..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -C_FILES = bspclean.c bspstart.c setvec.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c -shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c -shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c -shared_C_FILES += $(top_srcdir)/../../shared/main.c -shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c -shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c -OBJS += \ - $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -$(PGM): $(OBJS) - $(make-rel) - -project_lib_DATA = linkcmds - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds.dl setvec.c - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index 627efbdd5a..c38d8532d7 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -2,12 +2,9 @@ ## $Id$ ## -BSP_PIECES = startup dlentry -# pieces to pick up out of libcpu/ppc +OBJS = ../startup$(LIB_VARIANT).rel ../dlentry$(LIB_VARIANT).rel -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ +OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ -- cgit v1.2.3