RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* Makefile.am: Misc cleanups and fixes.
	* start/Makefile.am: Misc cleanups and fixes.
	* startup/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-09 14:13:13 +00:00
parent a079546663
commit 50b3fcf2f8
5 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Misc cleanups and fixes.
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ide/Makefile.am: PGM = ide.rel.

5
c/src/lib/libbsp/i386/pc386/Makefile.am
View File

@@ -11,11 +11,6 @@ SUBDIRS = . tools start startup clock console timer ne2000 wd8003 3c509 ide \
include $(top_srcdir)/../../bsp.am
$(PROJECT_RELEASE)/BootImgs:
$(mkinstalldirs) $@
TMPINSTALL_FILES = $(PROJECT_RELEASE)/BootImgs
# This driver needs to be reworked for the BSD stack.
# We only install wd80x3.h if HAS_NETWORKING was defined
if HAS_NETWORKING

30
c/src/lib/libbsp/i386/pc386/start/Makefile.am
View File

@@ -10,6 +10,7 @@ OBJS = $(S_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
include $(top_srcdir)/../../bspstart.am
#
# (OPTIONAL) Add local stuff here using +=
@@ -17,14 +18,8 @@ include $(top_srcdir)/../../../../automake/lib.am
LINKCMDS = $(top_srcdir)/startup/linkcmds
START_O_FILES = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
START_O_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin
install-data-local: $(START_O_FILES)
@$(mkinstalldirs) $(DESTDIR)$(bsplibdir)
list='$(START_O_FILES)'; for i in $$list; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(bsplibdir); \
done
project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
project_lib_DATA += ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin
$(ARCH)/start16.$(OBJEXT): start16.S $(ARCH)/$(dirstamp)
$(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
@@ -35,17 +30,16 @@ $(ARCH)/start16.bin: $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp)
-o $(basename $@)-elf32.$(OBJEXT) $(basename $@).$(OBJEXT)
$(OBJCOPY) -O binary $(basename $@)-elf32.$(OBJEXT) $@
$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: $(ARCH)/start16.bin
$(INSTALL_DATA) $< $@
$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT)
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \
$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
all-local: $(OBJS) $(TMPINSTALL_FILES)
all-local: $(TMPINSTALL_FILES)
EXTRA_DIST = start.S start16.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)
${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin: ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin
include $(top_srcdir)/../../../../automake/local.am

13
c/src/lib/libbsp/i386/pc386/startup/Makefile.am
View File

@@ -27,17 +27,14 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(startup_rel_OBJECTS)
$(make-rel)
bsplib_DATA = linkcmds
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
project_lib_DATA = linkcmds
all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
EXTRA_DIST = bspstart.c exit.c ldsegs.S linkcmds sbrk.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

4
c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am
View File

@@ -11,8 +11,8 @@ endif
BSP_FILES = startup clock console timer $(NETWORK) ide
# 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