diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2006-12-13 10:39:14 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2006-12-13 10:39:14 +0000 |
| commit | 7d38f3c3aeee12faa684db83c08f4ba59718170d (patch) | |
| tree | f2623bb3eece1fd8a8672f0ca3ff0228135a4d53 | |
| parent | e7cd1e99eaf85056896c4d0915e34d4d56daccf9 (diff) | |
| download | cygnal-7d38f3c3aeee12faa684db83c08f4ba59718170d.tar.gz cygnal-7d38f3c3aeee12faa684db83c08f4ba59718170d.tar.bz2 cygnal-7d38f3c3aeee12faa684db83c08f4ba59718170d.zip | |
libgloss/
* m68k/Makefile (install_cf): Don't loop over files here. Only
install sources for the default multilib.
(install_fido): Likewise.
(install_io): Install bsps in one go.
| -rw-r--r-- | ChangeLog.csl | 8 | ||||
| -rw-r--r-- | libgloss/m68k/Makefile.in | 39 |
2 files changed, 27 insertions, 20 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index f364afcf6..782e4d31f 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,11 @@ +2006-12-13 Nathan Sidwell <nathan@codesourcery.com> + + libgloss/ + * m68k/Makefile (install_cf): Don't loop over files here. Only + install sources for the default multilib. + (install_fido): Likewise. + (install_io): Install bsps in one go. + 2006-12-01 Nathan Sidwell <nathan@codesourcery.com> Kazu Hirata <kazu@codesourcery.com> diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in index f357c7019..576b0d20b 100644 --- a/libgloss/m68k/Makefile.in +++ b/libgloss/m68k/Makefile.in @@ -439,33 +439,32 @@ install_m68k:: .PHONY: install_cf install_cf:: install_io # install CF stuff - for crt in $(CF_CRT0S) ; \ - do $(INSTALL_DATA) $$crt $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$crt ; \ - done - $(INSTALL_DATA) $(CF_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CF_BSP) - for script in $(CF_SCRIPTS) ; \ - do $(INSTALL_DATA) $$script $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$script ; \ - done - for src in $(CF_SOURCES) ; \ - do $(INSTALL_DATA) ${srcdir}/$$src $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$src ; \ - done + $(INSTALL_DATA) $(CF_CRT0S) $(CF_BSP) \ + $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} + $(INSTALL_DATA) $(CF_SCRIPTS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} +ifeq ($(MULTISUBDIR),) + # only install sources for the default multilib + $(INSTALL_DATA) $(addprefix ${srcdir}/,$(CF_SOURCES)) \ + $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} +endif .PHONY: install_fido install_fido:: install_io - $(INSTALL_PROGRAM) $(FIDO_CRT0S) $(FIDO_BSP) $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR) - for x in $(FIDO_SCRIPTS); do \ - $(INSTALL_DATA) $$x $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \ - done - mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/src - for x in $(FIDO_SOURCES); do \ - $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/src; \ - done + $(INSTALL_DATA) $(FIDO_CRT0S) $(FIDO_BSP) \ + $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR) + $(INSTALL_DATA) $(FIDO_SCRIPTS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} +ifeq ($(MULTISUBDIR),) + # only install sources for the default multilib + $(INSTALL) -d $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/src + $(INSTALL_DATA) $(addprefix $(srcdir)/,$(FIDO_SOURCES)) \ + $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/src +endif .PHONY: install_io install_io:: # install IO stuff - $(INSTALL_DATA) $(HOSTED_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(HOSTED_BSP) - $(INSTALL_DATA) $(UNHOSTED_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(UNHOSTED_BSP) + $(INSTALL_DATA) $(HOSTED_BSP) $(UNHOSTED_BSP) \ + $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} # target specific makefile fragment comes in here. @target_makefile_frag@ |