diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-05 06:14:08 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-05 06:14:08 +0000 |
commit | 641194760114279c1665f9a6b214b452236eaa83 (patch) | |
tree | 47f9fcbc0eebaef75c305eac32bbc579f5810fa1 /c/src/lib/libbsp/arm | |
parent | 2003-12-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-641194760114279c1665f9a6b214b452236eaa83.tar.bz2 |
2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate $(LIB).
Use noinst_DATA to trigger building libbsp.a.
Diffstat (limited to 'c/src/lib/libbsp/arm')
-rw-r--r-- | c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/armulator/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/vegaplus/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am | 10 |
8 files changed, 28 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 1701ababe2..266df19718 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> PR 541/bsps diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am index f14391330e..a15b506a1c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am @@ -6,18 +6,13 @@ BSP_PIECES = clock console startup timer irq # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) -LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -# -# (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/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index f287126419..f8c8b4cf12 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am index 2bea4bc711..6a713535d4 100644 --- a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/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/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index fd9fed4020..1174841a3a 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> PR 541/bsps diff --git a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am index 66f649a759..e16df1505a 100644 --- a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am @@ -9,18 +9,13 @@ OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) -LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -# -# (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/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index 94349a44fd..cc8c8de1ab 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog @@ -1,3 +1,8 @@ +2004-01-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Eliminate $(LIB). + Use noinst_DATA to trigger building libbsp.a. + 2003-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> PR 541/bsps diff --git a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am index 5cdc5bd7d4..8f37950e04 100644 --- a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/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 |