From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/exec/wrapup/itron/Makefile.am | 5 ++--- c/src/exec/wrapup/posix/Makefile.am | 7 +++---- c/src/exec/wrapup/rtems/Makefile.am | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'c/src/exec/wrapup') diff --git a/c/src/exec/wrapup/itron/Makefile.am b/c/src/exec/wrapup/itron/Makefile.am index 58ceeb6d05..8f801355df 100644 --- a/c/src/exec/wrapup/itron/Makefile.am +++ b/c/src/exec/wrapup/itron/Makefile.am @@ -21,13 +21,12 @@ OBJS = $(ITRON_OBJS) $(LIB): ${OBJS} $(make-library) -ITRON_LIB = \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +ITRON_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(LIB) $(TMPINSTALL_FILES) +all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES) endif diff --git a/c/src/exec/wrapup/posix/Makefile.am b/c/src/exec/wrapup/posix/Makefile.am index d80634763d..7bcd49438a 100644 --- a/c/src/exec/wrapup/posix/Makefile.am +++ b/c/src/exec/wrapup/posix/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 if HAS_POSIX LIBNAME = libposix -LIB = $(ARCH)/$(LIBNAME).a +LIB = $(ARCH)/$(LIBNAME).a endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -21,13 +21,12 @@ OBJS = $(POSIX_OBJS) $(LIB): ${OBJS} $(make-library) -POSIX_LIB = \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +POSIX_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(LIB) $(TMPINSTALL_FILES) +all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES) endif diff --git a/c/src/exec/wrapup/rtems/Makefile.am b/c/src/exec/wrapup/rtems/Makefile.am index d2cadc9a58..4659f409ce 100644 --- a/c/src/exec/wrapup/rtems/Makefile.am +++ b/c/src/exec/wrapup/rtems/Makefile.am @@ -25,12 +25,11 @@ $(LIB): ${OBJS} $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \ >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) $(INSTALL_DATA) $< $@ -all: ${ARCH} $(TMPINSTALL_FILES) +all-local: ${ARCH} $(TMPINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3