diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-09 14:45:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-09 14:45:26 +0000 |
| commit | 0e2094d870c9d35a4813f2b5e6e1776956f765f9 (patch) | |
| tree | c6e8745c0dd59891605f9c4db58e4f0fb54aaee9 /c | |
| parent | 2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-0e2094d870c9d35a4813f2b5e6e1776956f765f9.tar.bz2 | |
2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Convert to automake-building rules.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 14 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 28 |
2 files changed, 24 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 15d65afde1..2df14a24ad 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,10 +1,14 @@ +2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * wrapup/Makefile.am: Convert to automake-building rules. + 2004-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - * Makefile.am: Merge-in clock/.cvsignore, console/.cvsignore, - irq/.cvsignore, network/.cvsignore, startup/.cvsignore, - vectors/.cvsignore. Use automake compilation rules. - * clock/.cvsignore, console/.cvsignore, irq/.cvsignore, - network/.cvsignore, startup/.cvsignore, vectors/.cvsignore: Remove. + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + irq/Makefile.am, network/Makefile.am, startup/Makefile.am, + vectors/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, irq/Makefile.am, + network/Makefile.am, startup/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile: Reflect changes above. diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am index 807ad6119b..7cab8f42a8 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -2,16 +2,19 @@ ## $Id$ ## -OBJS = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../startup$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel +include $(top_srcdir)/../../../../automake/compile.am +EXTRA_LIBRARIES = ../libbsp.a +CLEANFILES = ../libbsp.a +___libbsp_a_SOURCES = +___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ + ../startup$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ + ../vectors$(LIB_VARIANT).rel if HAS_NETWORKING -OBJS += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel endif - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ +___libbsp_a_LIBADD += \ + ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \ ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8260/clock$(LIB_VARIANT).rel \ @@ -21,12 +24,11 @@ OBJS += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8260/timer$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8260/exceptions$(LIB_VARIANT).rel -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -$(ARCH)/libbsp.a: $(OBJS) - $(make-library) +EXTRA_LIBRARIES += ../libbsp_g.a +CLEANFILES += ../libbsp_g.a +___libbsp_g_a_SOURCES = $(___libbsp_a_SOURCES) +___libbsp_g_a_LIBADD = $(___libbsp_a_LIBADD) -noinst_DATA = $(ARCH)/libbsp.a +noinst_DATA = ../libbsp$(LIB_VARIANT).a include $(top_srcdir)/../../../../automake/local.am |