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

* Makefile.am: Add PREINSTALL_DIRS.
	* consolex/Makefile.am: Add PREINSTALL_DIRS.
	* wrapup/Makefile.am: Reflect changes to libcpu.
This commit is contained in:
Ralf Corsepius
2004-01-21 14:46:06 +00:00
parent aed95bd389
commit 657bc88093
4 changed files with 15 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* consolex/Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add AM_CONDITIONAL(HAS_FPSP).

View File

@@ -35,6 +35,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
EXTRA_DIST = times
PREINSTALL_DIRS =
TMPINSTALL_FILES =
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
@@ -58,6 +59,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE
TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am

View File

@@ -27,17 +27,19 @@ all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES)
EXTRA_DIST = README cTest.c consolex.c consolex.h
PREINSTALL_DIRS =
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
$(PROJECT_INCLUDE)/consolex.h: consolex.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/consolex.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/consolex.h
CLEANFILES = $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS)
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -12,11 +12,12 @@ BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard ../consolex/$(ARCH)/consolex.rel) \
../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \
../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel
../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
if HAS_FPSP
OBJS += ../../../../libcpu/m68k/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
OBJS += \
../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
endif
include $(top_srcdir)/../../../../automake/compile.am