diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:46:20 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 14:46:20 +0000 |
| commit | 7fc5229c3ab66933ebfb44df1d27bb65e4b17d99 (patch) | |
| tree | c22d24d695db075bc76e7950cc8666b53517bc87 /c/src/lib/libbsp/m68k | |
| parent | 2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7fc5229c3ab66933ebfb44df1d27bb65e4b17d99.tar.bz2 | |
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
39 files changed, 127 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index e024a71fbc..3a025096bd 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am index 3c9c7ae169..eb87800124 100644 --- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.am @@ -23,6 +23,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -34,6 +35,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am index 643009945e..1cf8439113 100644 --- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 2405da4d18..e81830b9e1 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 17fd48def2..896004218c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -24,6 +24,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -39,6 +40,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am index 3886742988..acf1802a8b 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am @@ -11,8 +11,8 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index e03d0588d2..5f79ac7c05 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 46419544b5..a2fc1429b4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -26,6 +26,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -57,6 +58,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am index 4eaae20fce..a32cbb32ca 100644 --- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 41694516e3..7819703860 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 47424a923d..e27cb86b8e 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -21,6 +21,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -32,6 +33,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am index 64d50bc770..1a5f9586ae 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am @@ -11,11 +11,12 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel if HAS_FPSP -OBJS += ../../../../libcpu/m68k/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel +OBJS += \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel endif include $(top_srcdir)/../../../../automake/compile.am diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index b5f9389d18..9acd0dbdef 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index 42b25326a9..fbfad42d7f 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -25,6 +25,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = include/README EXTRA_DIST += times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/leds.h: include/leds.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -40,6 +41,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am index 4eaae20fce..a32cbb32ca 100644 --- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 56cd5e6126..bff6d13781 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 2bcac576de..585439d0e1 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -29,6 +29,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -60,6 +61,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am index e384687083..8a1466d9f9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am @@ -6,12 +6,12 @@ BSP_PIECES = startup console i2c tod nvram # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel \ - ../../../../libcpu/m68k/mcf5206/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/m68k/mcf5206/console$(LIB_VARIANT).rel \ - ../../../../libcpu/m68k/mcf5206/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/m68k/mcf5206/mbus$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/mcf5206/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/mcf5206/console$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/mcf5206/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/mcf5206/mbus$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index c8550a7e17..9e305b1410 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 7aca6814fe..ba6380f6be 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -24,6 +24,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -39,6 +40,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am index 643009945e..1cf8439113 100644 --- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 0bdc10fcad..da0814cdb3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index b408e5899a..4e8ddc7d4d 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -23,6 +23,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -34,6 +35,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am index 8ad5205891..6848009776 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am @@ -12,8 +12,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: $(OBJS) $(make-library) diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index aeec70bfa5..d0cde1e4ef 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index aeac766cc9..f31e1a5f7e 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -22,6 +22,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -33,6 +34,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am index 4eaae20fce..a32cbb32ca 100644 --- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index c3b871e883..0fcd13457b 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 5a982f7282..2126d7643f 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -22,6 +22,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -33,6 +34,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 8ad5205891..6848009776 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am @@ -12,8 +12,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: $(OBJS) $(make-library) diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 6cd15e36c1..223c9c496f 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Reflect changes to libcpu. diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index bf243bf9f8..5d5a07ccd8 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -28,6 +28,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -51,6 +52,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am index 2b3967a6c8..34d1d041b5 100644 --- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am @@ -11,9 +11,9 @@ BSP_PIECES = clock console fatal startup timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel \ - ../../../../libcpu/m68k/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 9cbc7d80d9..16cfafa212 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Remove non-existing times from EXTRA_DIST. diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 0f8102d63c..4c2e1ccb63 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -18,6 +18,8 @@ include_HEADERS += include/coverhd.h all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = + $(PROJECT_INCLUDE)/bare.h: include/bare.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bare.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bare.h @@ -39,6 +41,7 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am index 4eaae20fce..a32cbb32ca 100644 --- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 95b5bff99d..c81d39507e 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index 2fa677311e..7ecd6e28e7 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -21,6 +21,7 @@ project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -31,7 +32,9 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -CLEANFILES = $(TMPINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am index d4f92ac1f7..9d2b15024f 100644 --- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am @@ -9,8 +9,8 @@ include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: ${OBJS} $(make-library) |