diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:12:08 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:12:08 +0000 |
| commit | 1f9c4b2f4322f0566147b70957a0887741ce9eeb (patch) | |
| tree | ee726841c259d9a96c47561880a96a24b2e07106 /c | |
| parent | 2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-1f9c4b2f4322f0566147b70957a0887741ce9eeb.tar.bz2 | |
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am | 3 |
6 files changed, 18 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 07a928c9b9..3e06b879ab 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -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> * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 872ac59f0b..3f2fc1795c 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am @@ -22,6 +22,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -33,6 +34,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 diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index fff2b17fc9..afd1ec2b69 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am @@ -12,7 +12,8 @@ BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/i386/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/i386/score$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index a3636ab81a..39992fb1d4 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -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> * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am index 04b38ffd35..f64667de3a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am @@ -27,6 +27,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = if HAS_NETWORKING @@ -44,6 +45,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 diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am index fff2b17fc9..afd1ec2b69 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am @@ -12,7 +12,8 @@ BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/i386/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/i386/score$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am |