diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:15:48 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 14:15:48 +0000 |
commit | ae31530b999f1b802c7866ec5e610f275f75e636 (patch) | |
tree | 8e9fc0aec41c3ced0e883feb2455278f11689cdc /c/src/lib/libbsp/i386/i386ex | |
parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-ae31530b999f1b802c7866ec5e610f275f75e636.tar.bz2 |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 4 |
4 files changed, 20 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 13679cd5b4..0b0f751d69 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,9 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am index 76a1d4da96..0d92b601be 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am @@ -11,22 +11,20 @@ OBJS = $(S_O_FILES) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../bspstart.am # # (OPTIONAL) Add local stuff here using += # -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S +${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am index b1b6960742..017ea08ac7 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am @@ -26,19 +26,16 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(startup_rel_OBJECTS) $(make-rel) -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds UNUSED_C_FILES = setvec.c -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) - EXTRA_DIST = README bspstart.c linkcmds setvec.c +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index 46fa5d0eca..a40c85c2f3 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am @@ -11,8 +11,8 @@ endif BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a |