From 641194760114279c1665f9a6b214b452236eaa83 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 5 Jan 2004 06:14:08 +0000 Subject: 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). Use noinst_DATA to trigger building libbsp.a. --- c/src/lib/libbsp/i960/cvme961/ChangeLog | 5 +++++ c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am | 6 ++---- c/src/lib/libbsp/i960/i960sim/ChangeLog | 5 +++++ c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am | 10 ++-------- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 5 +++++ c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am | 9 ++------- 6 files changed, 21 insertions(+), 19 deletions(-) (limited to 'c/src/lib/libbsp/i960') diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog index 762082790b..60edf26ae4 100644 --- a/c/src/lib/libbsp/i960/cvme961/ChangeLog +++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-18 Ralf Corsepius * wrapup/Makefile.am: Remove GENERIC_FILES. diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am index d196020e8e..4a2132ab20 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am @@ -15,11 +15,9 @@ OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) -LIB = $(ARCH)/libbsp.a - -$(LIB): ${OBJS} +$(ARCH)/libbsp.a: ${OBJS} $(make-library) -all-local: $(LIB) +noinst_DATA = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog index a1a197d8f5..4150e4ff10 100644 --- a/c/src/lib/libbsp/i960/i960sim/ChangeLog +++ b/c/src/lib/libbsp/i960/i960sim/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-13 Ralf Corsepius * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am index 2bea4bc711..6a713535d4 100644 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am @@ -14,15 +14,9 @@ OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(foreach piece, $(GENERIC_FILES), \ ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB = $(ARCH)/libbsp.a - -# -# (OPTIONAL) Add local stuff here using += -# - -$(LIB): ${OBJS} +$(ARCH)/libbsp.a: ${OBJS} $(make-library) -all-local: $(LIB) +noinst_DATA = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index 2257244259..095d9f3673 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-13 Ralf Corsepius * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am index 391609c1be..273c006d76 100644 --- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am @@ -11,15 +11,10 @@ BSP_PIECES = startup clock console timer OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) -LIB = $(ARCH)/libbsp.a -# -# (OPTIONAL) Add local stuff here using += -# - -$(LIB): $(OBJS) +$(ARCH)/libbsp.a: $(OBJS) $(make-library) -all-local: $(LIB) +noinst_DATA = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3