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

* console/Makefile.am: Misc cleanups and fixes.
	* i2c/Makefile.am: Misc cleanups and fixes.
	* nvram/Makefile.am: Misc cleanups and fixes.
	* start/Makefile.am: Misc cleanups and fixes.
	* startup/Makefile.am: Misc cleanups and fixes.
	* tod/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-10 12:36:55 +00:00
parent 332a2987db
commit 54a1f5ddb2
8 changed files with 38 additions and 37 deletions
@@ -1,3 +1,13 @@
2003-12-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Misc cleanups and fixes.
* i2c/Makefile.am: Misc cleanups and fixes.
* nvram/Makefile.am: Misc cleanups and fixes.
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* tod/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Remove all: $(ARCH)..
@@ -21,8 +21,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all: $(OBJS) $(PGM)
all-local: $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = console.c
@@ -21,8 +21,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all: $(OBJS) $(PGM)
all-local: $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = $(C_FILES)
@@ -21,8 +21,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all: $(OBJS) $(PGM)
all-local: $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = nvram.c
@@ -9,24 +9,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) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES)
.PRECIOUS: $(ARCH)/start.$(OBJEXT)
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
@@ -22,26 +22,25 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(OBJS)
$(make-rel)
$(PROJECT_RELEASE)/lib/gdbinit: gdbinit
$(INSTALL_DATA) $< $@
bsplib_DATA = linkcmds gdbinit linkcmds.flash
$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
$(PROJECT_RELEASE)/lib/linkcmds.flash: linkcmds.flash
$(INSTALL_DATA) $< $@
project_lib_DATA = linkcmds gdbinit linkcmds.flash
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \
$(PROJECT_RELEASE)/lib/linkcmds.flash $(PROJECT_RELEASE)/lib/gdbinit
all: $(OBJS) $(PGM) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGM)
all-local: $(PGM) $(TMPINSTALL_FILES)
EXTRA_DIST = bspclean.c bspstart.c init5206e.c linkcmds linkcmds.flash \
gdbinit
${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds
${PROJECT_RELEASE}/lib/gdbinit: gdbinit ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/gdbinit
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/gdbinit
${PROJECT_RELEASE}/lib/linkcmds.flash: linkcmds.flash ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds.flash
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds.flash
include $(top_srcdir)/../../../../automake/local.am
@@ -23,8 +23,7 @@ $(PGM): $(OBJS)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
all: $(OBJS) $(PGM)
all-local: $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = ds1307.c todcfg.c
@@ -7,8 +7,8 @@ BSP_PIECES = startup console i2c tod nvram
CPU_PIECES = clock console timer mbus
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard \
../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \
$(foreach piece, $(CPU_PIECES), \
../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) \
@@ -26,6 +26,6 @@ include $(top_srcdir)/../../../../automake/lib.am
$(LIB): $(OBJS)
$(make-library)
all: $(OBJS) $(LIB) $(TMPINSTALL_FILES)
all-local: $(LIB)
include $(top_srcdir)/../../../../automake/local.am