2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Add PREINSTALL_DIRS.
	* wrapup/Makefile.am: Reflect changes to libcpu.
This commit is contained in:
Ralf Corsepius
2004-01-21 07:56:36 +00:00
parent 7984a69ae9
commit e06d84537d
3 changed files with 13 additions and 9 deletions

View File

@@ -1,3 +1,8 @@
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.

View File

@@ -16,11 +16,14 @@ all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times EXTRA_DIST = times
PREINSTALL_DIRS =
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
CLEANFILES = $(PREINSTALL_FILES) CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

View File

@@ -3,21 +3,17 @@
## ##
BSP_FILES = startup console liblnk BSP_FILES = startup console liblnk
CPU_FILES = clock timer
include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am include $(top_srcdir)/../../../../automake/lib.am
# bummer; have to use $foreach since % pattern subst rules only replace 1x # bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(foreach piece, $(CPU_FILES), $(wildcard \ ../../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \
../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT))) \ ../../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ ../../../../libcpu/mips/r46xx/clock$(LIB_VARIANT).rel \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/r46xx/*/$(ARCH)/*.$(OBJEXT)) \ ../../../../libcpu/mips/r46xx/timer$(LIB_VARIANT).rel \
$(wildcard \ ../../../../libcpu/mips/r46xx/vectorisrs$(LIB_VARIANT).rel
../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \
$(foreach piece, $(GENERIC_FILES), \
../../../$(piece)/$(ARCH)/$(piece).rel)
$(ARCH)/libbsp.a: $(OBJS) $(ARCH)/libbsp.a: $(OBJS)
$(make-library) $(make-library)