From b35414a6f8e115a844f52fe01747882fce51cf66 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 13 Dec 2003 05:09:48 +0000 Subject: 2003-12-13 Ralf Corsepius * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. * startup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. --- c/src/lib/libbsp/m68k/efi332/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/efi332/start/Makefile.am | 30 ++++++++++++------------ c/src/lib/libbsp/m68k/efi332/startup/Makefile.am | 18 +++++++------- 3 files changed, 29 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp/m68k/efi332') diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index 06bc71bef7..813c65e288 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,8 @@ +2003-12-13 Ralf Corsepius + + * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + * startup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + 2003-12-12 Ralf Corsepius * start/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am index 6308b53579..917008e050 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am @@ -42,24 +42,24 @@ all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.c except_vect_332_ROM.S ram_init.ld ram_init.sed -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) -${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) +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): $(ARCH)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT): $(ARCH)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) -${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT): $(ARCH)/ram_init$(LIB_VARIANT) ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT) -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ram_init$(LIB_VARIANT) +$(PROJECT_LIB)/ram_init$(LIB_VARIANT): $(ARCH)/ram_init$(LIB_VARIANT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/ram_init$(LIB_VARIANT) +TMPINSTALL_FILES += $(PROJECT_LIB)/ram_init$(LIB_VARIANT) -${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT): $(ARCH)/ram_init_FW$(LIB_VARIANT) ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT) -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ram_init_FW$(LIB_VARIANT) +$(PROJECT_LIB)/ram_init_FW$(LIB_VARIANT): $(ARCH)/ram_init_FW$(LIB_VARIANT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/ram_init_FW$(LIB_VARIANT) +TMPINSTALL_FILES += $(PROJECT_LIB)/ram_init_FW$(LIB_VARIANT) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index a89f7e6251..9452c9ade9 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -30,16 +30,16 @@ all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c linkcmds linkcmds_ROM -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) -${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds +$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds -${PROJECT_RELEASE}/lib/linkcmds_ROM: linkcmds_ROM ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds_ROM -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds_ROM +$(PROJECT_LIB)/linkcmds_ROM: linkcmds_ROM $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds_ROM +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds_ROM include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3