From 534987dcbdaad02d82232fa0afd28efad16e2659 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 06:47:28 +0000 Subject: 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. Add PRE/TMPINSTALL_FILES to CLEANFILES. --- c/src/lib/libcpu/i386/ChangeLog | 5 +++++ c/src/lib/libcpu/i386/Makefile.am | 3 +++ c/src/lib/libcpu/i960/ChangeLog | 5 +++++ c/src/lib/libcpu/i960/Makefile.am | 3 +++ c/src/lib/libcpu/m68k/mcf5206/ChangeLog | 5 +++++ c/src/lib/libcpu/m68k/mcf5206/Makefile.am | 3 +++ c/src/lib/libcpu/sh/sh7032/ChangeLog | 5 +++++ c/src/lib/libcpu/sh/sh7032/Makefile.am | 4 ++++ c/src/lib/libcpu/sh/sh7045/ChangeLog | 5 +++++ c/src/lib/libcpu/sh/sh7045/Makefile.am | 4 ++++ c/src/lib/libcpu/sh/sh7750/ChangeLog | 5 +++++ c/src/lib/libcpu/sh/sh7750/Makefile.am | 4 ++++ c/src/libchip/ChangeLog | 5 +++++ c/src/libchip/Makefile.am | 7 +++++++ c/src/librtems++/ChangeLog | 5 +++++ c/src/librtems++/Makefile.am | 6 ++++++ c/src/optman/ChangeLog | 5 +++++ c/src/optman/Makefile.am | 5 +++++ 18 files changed, 84 insertions(+) (limited to 'c/src') diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog index 43770a7ec9..4ac0d9a8a9 100644 --- a/c/src/lib/libcpu/i386/ChangeLog +++ b/c/src/lib/libcpu/i386/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-16 Ralf Corsepius * Makefile.am: Eliminate VPATH. diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index f4b6a28322..2c20bdeb60 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -38,6 +38,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/cpu.h: cpu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpu.h @@ -51,4 +52,6 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog index a4032c9062..f5ac1639cd 100644 --- a/c/src/lib/libcpu/i960/ChangeLog +++ b/c/src/lib/libcpu/i960/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am index 03fec6e274..46cb4e97d2 100644 --- a/c/src/lib/libcpu/i960/Makefile.am +++ b/c/src/lib/libcpu/i960/Makefile.am @@ -18,6 +18,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/i960CA.h: include/i960CA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960CA.h @@ -39,5 +40,7 @@ $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h: include/i960JX_RP_common.h $(PROJE $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog index dca3e476af..7ed1c9bcd5 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog +++ b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am index 2cc74b4b36..67849642e1 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am @@ -90,6 +90,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/mcf5206/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/mcf5206 @: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: include/mcf5206e.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h @@ -103,4 +104,6 @@ $(PROJECT_INCLUDE)/mcf5206/mcfuart.h: include/mcfuart.h $(PROJECT_INCLUDE)/mcf52 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog index 99401ba51d..cdeda554e5 100644 --- a/c/src/lib/libcpu/sh/sh7032/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7032/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index 021b27aa03..fbae5b81cb 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -89,10 +89,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(PROJECT_INCLUDE)/sh/sci.h: include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h @@ -114,4 +116,6 @@ $(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/iosh7032.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog index 8e6a2f81c9..84b8720796 100644 --- a/c/src/lib/libcpu/sh/sh7045/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index ef732f4b96..9dbf7a179c 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -77,10 +77,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(PROJECT_INCLUDE)/sh/io_types.h: include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h @@ -110,4 +112,6 @@ $(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/iosh7045.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog index 69728d8a0b..3c8fc67861 100644 --- a/c/src/lib/libcpu/sh/sh7750/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am index 200d4ce1c8..44456183f0 100644 --- a/c/src/lib/libcpu/sh/sh7750/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am @@ -82,10 +82,12 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(PROJECT_INCLUDE)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h @@ -111,4 +113,6 @@ $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h +CLEANFILES = $(PREINSTALL_FILES) + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index d647c993c0..ab1d3d67ca 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-18 Ralf Corsepius * Makefile.am: Add shmdr. Use noinst_DATA instead of TMP_LIBS. diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index 9ef41891f9..5f263ccb22 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -156,19 +156,23 @@ EXTRA_DIST += $(libserialio_C_FILES) $(libserialio_DOC_FILES) CLEANDIRS = */$(ARCH) PREINSTALL_FILES = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) if LIBCHIP $(PROJECT_INCLUDE)/libchip/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libchip @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) endif if LIBCHIP @@ -275,4 +279,7 @@ $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel $( TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel endif +CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(TMPINSTALL_FILES) + include $(top_srcdir)/automake/local.am diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 1dc9fcb945..819a560cdf 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-13 Ralf Corsepius * Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index b68b6b3221..2d2275437d 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -33,15 +33,18 @@ endif all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_FILES = +TMPINSTALL_FILES = $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) if HAS_CXX $(PROJECT_INCLUDE)/rtems++/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems++ @: > $(PROJECT_INCLUDE)/rtems++/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/$(dirstamp) $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h: include/rtems++/rtemsEvent.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h @@ -80,4 +83,7 @@ $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a $( TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a endif +CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(TMPINSTALL_FILES) + include $(top_srcdir)/../automake/local.am diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog index 52cbb2b361..50cf3cab42 100644 --- a/c/src/optman/ChangeLog +++ b/c/src/optman/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + 2003-12-13 Ralf Corsepius * Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am index 01be74af2b..bdc3be24f2 100644 --- a/c/src/optman/Makefile.am +++ b/c/src/optman/Makefile.am @@ -40,9 +40,12 @@ all-local: $(PGMS) $(TMPINSTALL_FILES) EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES) +TMPINSTALL_FILES = + $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: $(ARCH)/no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel @@ -92,4 +95,6 @@ $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: $(ARCH)/no-timer$(LIB_VARIANT).rel $( $(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel +CLEANFILES = $(TMPINSTALL_FILES) + include $(top_srcdir)/automake/local.am -- cgit v1.2.3