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/arm/armulator/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/armulator/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/arm/armulator/startup/Makefile.am | 12 ++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) (limited to 'c/src/lib/libbsp/arm/armulator') diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index 378c5ebbbb..f287126419 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/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/arm/armulator/start/Makefile.am b/c/src/lib/libbsp/arm/armulator/start/Makefile.am index 51392e906c..954750bb5e 100644 --- a/c/src/lib/libbsp/arm/armulator/start/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/start/Makefile.am @@ -29,12 +29,12 @@ all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S -${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) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am index c52811510a..cde9d5cd8b 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am @@ -40,12 +40,12 @@ all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c exit.c linkcmds setvec.c -${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 include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3