From 50b3fcf2f81e33e839134ade538908205c9430c7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 9 Dec 2003 14:13:13 +0000 Subject: 2003-12-09 Ralf Corsepius * Makefile.am: Misc cleanups and fixes. * start/Makefile.am: Misc cleanups and fixes. * startup/Makefile.am: Misc cleanups and fixes. * wrapup/Makefile.am: Misc cleanups and fixes. --- c/src/lib/libbsp/i386/pc386/start/Makefile.am | 28 +++++++++++---------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'c/src/lib/libbsp/i386/pc386/start/Makefile.am') diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index 2a2fbb18b8..3287306598 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -10,6 +10,7 @@ OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../bspstart.am # # (OPTIONAL) Add local stuff here using += @@ -17,14 +18,8 @@ include $(top_srcdir)/../../../../automake/lib.am LINKCMDS = $(top_srcdir)/startup/linkcmds -START_O_FILES = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -START_O_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin - -install-data-local: $(START_O_FILES) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - list='$(START_O_FILES)'; for i in $$list; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(bsplibdir); \ - done +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin $(ARCH)/start16.$(OBJEXT): start16.S $(ARCH)/$(dirstamp) $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< @@ -35,17 +30,16 @@ $(ARCH)/start16.bin: $(ARCH)/start16.$(OBJEXT) $(ARCH)/$(dirstamp) -o $(basename $@)-elf32.$(OBJEXT) $(basename $@).$(OBJEXT) $(OBJCOPY) -O binary $(basename $@)-elf32.$(OBJEXT) $@ -$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: $(ARCH)/start16.bin - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \ - $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) +EXTRA_DIST = start.S start16.S -all-local: $(OBJS) $(TMPINSTALL_FILES) +${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) -EXTRA_DIST = start.S start16.S +${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin: ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3