From 7ed1e74731fadf6a4cfbdc18590c9c4d0d362a37 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 08:39:06 +0000 Subject: 2003-12-01 Ralf Corsepius * Makefile.am: Reformat. Apply dirstamps to preinstallation. * include/Makefile.am: Ditto. * include/rdbg/Makefile.am: Ditto. * include/rdbg/i386/Makefile.am: Ditto. * include/rdbg/m68k/Makefile.am: Ditto. * include/rdbg/powerpc/Makefile.am: Ditto: * src/Makefile.am: Ditto. * src/i386/Makefile.am: Ditto. * src/i386/any/Makefile.am: Ditto. * src/m68k/Makefile.am: Ditto. * src/m68k/any/Makefile.am: Ditto. * src/powerpc/Makefile.am: Ditto. * src/powerpc/new_exception_processing/Makefile.am: Ditto. --- c/src/librdbg/ChangeLog | 16 ++++++++++++++ c/src/librdbg/Makefile.am | 2 ++ c/src/librdbg/include/Makefile.am | 3 ++- c/src/librdbg/include/rdbg/Makefile.am | 25 +++++++++++++++------- c/src/librdbg/include/rdbg/i386/Makefile.am | 22 ++++++++++++------- c/src/librdbg/include/rdbg/m68k/Makefile.am | 22 ++++++++++++------- c/src/librdbg/include/rdbg/powerpc/Makefile.am | 22 ++++++++++++------- c/src/librdbg/src/Makefile.am | 2 ++ c/src/librdbg/src/i386/Makefile.am | 3 ++- c/src/librdbg/src/i386/any/Makefile.am | 21 +++++++++++------- c/src/librdbg/src/m68k/Makefile.am | 3 ++- c/src/librdbg/src/m68k/any/Makefile.am | 21 +++++++++++------- c/src/librdbg/src/powerpc/Makefile.am | 3 ++- .../powerpc/new_exception_processing/Makefile.am | 21 +++++++++++------- 14 files changed, 126 insertions(+), 60 deletions(-) diff --git a/c/src/librdbg/ChangeLog b/c/src/librdbg/ChangeLog index 6ec5250f31..e4a3c9818c 100644 --- a/c/src/librdbg/ChangeLog +++ b/c/src/librdbg/ChangeLog @@ -1,3 +1,19 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. Apply dirstamps to preinstallation. + * include/Makefile.am: Ditto. + * include/rdbg/Makefile.am: Ditto. + * include/rdbg/i386/Makefile.am: Ditto. + * include/rdbg/m68k/Makefile.am: Ditto. + * include/rdbg/powerpc/Makefile.am: Ditto: + * src/Makefile.am: Ditto. + * src/i386/Makefile.am: Ditto. + * src/i386/any/Makefile.am: Ditto. + * src/m68k/Makefile.am: Ditto. + * src/m68k/any/Makefile.am: Ditto. + * src/powerpc/Makefile.am: Ditto. + * src/powerpc/new_exception_processing/Makefile.am: Ditto. + 2003-08-22 Ralf Corsepius * src/i386/any/Makefile.am, src/m68k/any/Makefile.am, diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am index dca3bb7123..0989aebf5e 100644 --- a/c/src/librdbg/Makefile.am +++ b/c/src/librdbg/Makefile.am @@ -4,5 +4,7 @@ SUBDIRS = include src +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/Makefile.am b/c/src/librdbg/include/Makefile.am index e65a7c8c06..88df4dc2aa 100644 --- a/c/src/librdbg/include/Makefile.am +++ b/c/src/librdbg/include/Makefile.am @@ -2,8 +2,9 @@ ## $Id$ ## - SUBDIRS = rdbg +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am index 8413229787..8e272a407a 100644 --- a/c/src/librdbg/include/rdbg/Makefile.am +++ b/c/src/librdbg/include/rdbg/Makefile.am @@ -6,14 +6,6 @@ if HAS_RDBG include_rdbgdir = $(includedir)/rdbg include_rdbg_HEADERS = rdbg.h servrpc.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg \ - $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) - -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rdbg/%.h: %.h - $(INSTALL_DATA) $< $@ endif all-local: $(PREINSTALL_FILES) @@ -23,5 +15,22 @@ SUBDIRS = $(RTEMS_CPU) DIST_SUBDIRS = $(RTEMS_CPU) endif +PREINSTALL_FILES = + +if HAS_RDBG +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/rdbg.h: rdbg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg.h + +$(PROJECT_INCLUDE)/rdbg/servrpc.h: servrpc.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h +endif + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am index 3171f73d74..7fb5f44750 100644 --- a/c/src/librdbg/include/rdbg/i386/Makefile.am +++ b/c/src/librdbg/include/rdbg/i386/Makefile.am @@ -2,19 +2,25 @@ ## $Id$ ## - include_rdbgdir = $(includedir)/rdbg include_rdbg_HEADERS = rdbg_f.h reg.h -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg \ - $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rdbg/%.h: %.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h + +$(PROJECT_INCLUDE)/rdbg/reg.h: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/m68k/Makefile.am b/c/src/librdbg/include/rdbg/m68k/Makefile.am index 3171f73d74..7fb5f44750 100644 --- a/c/src/librdbg/include/rdbg/m68k/Makefile.am +++ b/c/src/librdbg/include/rdbg/m68k/Makefile.am @@ -2,19 +2,25 @@ ## $Id$ ## - include_rdbgdir = $(includedir)/rdbg include_rdbg_HEADERS = rdbg_f.h reg.h -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg \ - $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rdbg/%.h: %.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h + +$(PROJECT_INCLUDE)/rdbg/reg.h: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am index 3171f73d74..7fb5f44750 100644 --- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am +++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am @@ -2,19 +2,25 @@ ## $Id$ ## - include_rdbgdir = $(includedir)/rdbg include_rdbg_HEADERS = rdbg_f.h reg.h -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg \ - $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rdbg/%.h: %.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/rdbg_f.h: rdbg_f.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/rdbg_f.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg_f.h + +$(PROJECT_INCLUDE)/rdbg/reg.h: reg.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/reg.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/reg.h include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am index 861019e9f2..2a432ebaa0 100644 --- a/c/src/librdbg/src/Makefile.am +++ b/c/src/librdbg/src/Makefile.am @@ -10,5 +10,7 @@ endif EXTRA_DIST = _servtgt.c awk.svc excep.c ptrace.c rdbg.c remdeb.x servbkpt.c \ servcon.c servrpc.c servtgt.c servtsp.c servutil.c +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am index 311bc4744f..9f7706d4e1 100644 --- a/c/src/librdbg/src/i386/Makefile.am +++ b/c/src/librdbg/src/i386/Makefile.am @@ -2,10 +2,11 @@ ## $Id$ ## - SUBDIRS = any EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/i386/any/Makefile.am b/c/src/librdbg/src/i386/any/Makefile.am index 98b56a8125..2c75512f8c 100644 --- a/c/src/librdbg/src/i386/any/Makefile.am +++ b/c/src/librdbg/src/i386/any/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. RPCCPUDIR = $(RTEMS_CPU)/any @@ -76,13 +75,8 @@ if RPCTOOLS rm -f $(RPCCPUDIR)/tmpSvc.c ) endif -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/remdeb.h TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/m68k/Makefile.am b/c/src/librdbg/src/m68k/Makefile.am index 311bc4744f..9f7706d4e1 100644 --- a/c/src/librdbg/src/m68k/Makefile.am +++ b/c/src/librdbg/src/m68k/Makefile.am @@ -2,10 +2,11 @@ ## $Id$ ## - SUBDIRS = any EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/m68k/any/Makefile.am b/c/src/librdbg/src/m68k/any/Makefile.am index 98b56a8125..2c75512f8c 100644 --- a/c/src/librdbg/src/m68k/any/Makefile.am +++ b/c/src/librdbg/src/m68k/any/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. RPCCPUDIR = $(RTEMS_CPU)/any @@ -76,13 +75,8 @@ if RPCTOOLS rm -f $(RPCCPUDIR)/tmpSvc.c ) endif -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/remdeb.h TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am index f50ce5c267..fbd72f3669 100644 --- a/c/src/librdbg/src/powerpc/Makefile.am +++ b/c/src/librdbg/src/powerpc/Makefile.am @@ -2,10 +2,11 @@ ## $Id$ ## - SUBDIRS = new_exception_processing EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c +PREINSTALL_FILES = + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am index ea3b5d3d25..8c20fd159b 100644 --- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am +++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/..:@srcdir@/../.. RPCCPUDIR = $(RTEMS_CPU)/new_exception_processing @@ -76,13 +75,8 @@ if RPCTOOLS rm -f $(RPCCPUDIR)/tmpSvc.c ) endif -$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rdbg: - @$(mkinstalldirs) $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h +include_rdbgdir = $(includedir)/rdbg +include_rdbg_HEADERS = $(srcdir)/remdeb.h TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a @@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = remdeb_f.x $(GEN_C_FILES) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/rdbg/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg + @: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + +$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h + include $(top_srcdir)/automake/local.am -- cgit v1.2.3