From 81b29d794d4f8cb2896375fea31eb589c3baccb7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 06:47:48 +0000 Subject: 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. Add PRE/TMPINSTALL_FILES to CLEANFILES. * mpc505/Makefile.am: Ditto. * mpc6xx/Makefile.am: Ditto. * mpc8260/Makefile.am: Ditto. * mpc8xx/Makefile.am: Ditto. * ppc403/Makefile.am: Ditto. * shared/Makefile.am: Ditto. --- c/src/lib/libcpu/powerpc/ChangeLog | 11 +++++++++++ c/src/lib/libcpu/powerpc/Makefile.am | 3 +++ c/src/lib/libcpu/powerpc/mpc505/Makefile.am | 3 +++ c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am | 14 +++++++++----- c/src/lib/libcpu/powerpc/mpc8260/Makefile.am | 5 +++++ c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am | 5 +++++ c/src/lib/libcpu/powerpc/ppc403/Makefile.am | 3 +++ c/src/lib/libcpu/powerpc/shared/Makefile.am | 3 +++ 8 files changed, 42 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libcpu/powerpc') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 1770519a79..4e621707d0 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,14 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + * mpc505/Makefile.am: Ditto. + * mpc6xx/Makefile.am: Ditto. + * mpc8260/Makefile.am: Ditto. + * mpc8xx/Makefile.am: Ditto. + * ppc403/Makefile.am: Ditto. + * shared/Makefile.am: Ditto. + 2004-01-13 Ralf Corsepius * mpc6xx/Makefile.am: Remove libcpuspec.a (Unused). diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 1db61fec76..a5e715e074 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -42,6 +42,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/powerpc @: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) $(PROJECT_INCLUDE)/rtems/powerpc/cache.h: rtems/powerpc/cache.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/cache.h @@ -51,5 +52,7 @@ $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am index 6f721acb5e..17abf0a117 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am @@ -69,9 +69,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/ictrl.h: ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am index c51c4ce45e..d35d245ec5 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am @@ -17,7 +17,8 @@ exceptions_C_FILES = exceptions/raw_exception.c exceptions_S_FILES = exceptions/asm_utils.S EXTRA_DIST += $(exceptions_C_FILES) $(exceptions_S_FILES) -exceptions_rel_OBJECTS = $(exceptions_C_FILES:exceptions/%.c=exceptions/$(ARCH)/%.$(OBJEXT)) \ +exceptions_rel_OBJECTS = \ + $(exceptions_C_FILES:exceptions/%.c=exceptions/$(ARCH)/%.$(OBJEXT)) \ $(exceptions_S_FILES:exceptions/%.S=exceptions/$(ARCH)/%.$(OBJEXT)) exceptions/$(ARCH)/$(dirstamp): @@ -30,7 +31,7 @@ exceptions/$(ARCH)/%.$(OBJEXT): exceptions/%.S exceptions/$(ARCH)/$(dirstamp) exceptions/$(ARCH)/exceptions.rel: $(exceptions_rel_OBJECTS) $(make-rel) CLEANDIRS += exceptions/o-optimize exceptions/o-debug -noinst_DATA += exceptions/$(ARCH)/exceptions.rel +noinst_DATA += exceptions/$(ARCH)/exceptions.rel # mmu include_libcpu_HEADERS += mmu/bat.h mmu/pte121.h @@ -51,7 +52,7 @@ mmu/$(ARCH)/%.$(OBJEXT): mmu/%.S mmu/$(ARCH)/$(dirstamp) mmu/$(ARCH)/mmu.rel: $(mmu_rel_OBJECTS) $(make-rel) CLEANDIRS += mmu/o-optimize mmu/o-debug -noinst_DATA += mmu/$(ARCH)/mmu.rel +noinst_DATA += mmu/$(ARCH)/mmu.rel # clock include_libcpu_HEADERS += clock/c_clock.h @@ -69,7 +70,7 @@ clock/$(ARCH)/%.$(OBJEXT): clock/%.c clock/$(ARCH)/$(dirstamp) clock/$(ARCH)/clock.rel: $(clock_rel_OBJECTS) $(make-rel) CLEANDIRS += clock/o-optimize clock/o-debug -noinst_DATA += clock/$(ARCH)/clock.rel +noinst_DATA += clock/$(ARCH)/clock.rel # timer @@ -86,7 +87,7 @@ timer/$(ARCH)/%.$(OBJEXT): timer/%.c timer/$(ARCH)/$(dirstamp) timer/$(ARCH)/timer.rel: $(timer_rel_OBJECTS) $(make-rel) CLEANDIRS += timer/o-optimize timer/o-debug -noinst_DATA += timer/$(ARCH)/timer.rel +noinst_DATA += timer/$(ARCH)/timer.rel ## ---- all-local: $(PREINSTALL_FILES) @@ -96,6 +97,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h @@ -113,4 +115,6 @@ $(PROJECT_INCLUDE)/libcpu/c_clock.h: clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am index 4ecc584d14..8edc056d33 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am @@ -125,10 +125,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/mpc8260/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/mpc8260 @: > $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/$(dirstamp) $(PROJECT_INCLUDE)/mpc8260.h: include/mpc8260.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260.h @@ -149,9 +151,12 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am index 3910d15aa4..745878e1ef 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am @@ -127,10 +127,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/mpc8xx @: > $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp) $(PROJECT_INCLUDE)/mpc8xx.h: include/mpc8xx.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx.h @@ -151,9 +153,12 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am index c46cd4c974..75a97f981c 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am @@ -123,6 +123,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/ictrl.h: ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h @@ -134,4 +135,6 @@ $(PROJECT_INCLUDE)/tty_drv.h: tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h endif +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index c13e1b3bce..b441ee5a1f 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -58,6 +58,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/spr.h: include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h @@ -95,4 +96,6 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3