diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:13:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:13:07 +0000 |
| commit | f0ce52fcc22798ee59106520131fe9e57b126e5a (patch) | |
| tree | 94fe48f7dafb71363ecf5d29c028720fab9d3c66 /c | |
| parent | 2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f0ce52fcc22798ee59106520131fe9e57b126e5a.tar.bz2 | |
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* console/Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 4 |
4 files changed, 14 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 2c64efde16..f3111bdb61 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,9 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * console/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/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index 6d606369fd..f4a94bd913 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -47,6 +47,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5 +PREINSTALL_DIRS = TMPINSTALL_FILES = if HAS_NETWORKING @@ -72,6 +73,7 @@ $(PROJECT_LIB)/start16$(LIB_VARIANT).bin: $(ARCH)/start16$(LIB_VARIANT).bin $(PR TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index 57db7647a3..93f925a6b3 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am @@ -33,12 +33,13 @@ all-local: $(PREINSTALL_FILES) $(console_rel_OBJECTS) $(PGM) EXTRA_DIST = $(C_FILES) $(S_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(PROJECT_INCLUDE)/rtems/keyboard.h: keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h @@ -61,5 +62,6 @@ $(PROJECT_INCLUDE)/rtems/fb_vga.h: fb_vga.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index 0723eec1d7..c326bbfd38 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -12,7 +12,9 @@ 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), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/i386/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/i386/page$(LIB_VARIANT).rel \ + ../../../../libcpu/i386/score$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am |