From 8cdb582b49c1528216cfd316183536735474c899 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Apr 1999 15:41:33 +0000
Subject: Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

  This patch addresses a few minor issues and contains a few (minor)
  preparations for automake.

  * configure.in: Fix for handing c/src/tests subdirectory handling (FIX)
  * aclocal/rtems-top.m4:
    + Add TARGET_SUBDIR and --with-target-subdir (preparation of future
      enhancements for cross-compiling)
    + Activate RTEMS_ROOT handling (automake preparation)
  * automake/*.am: replace comments "#" with "##" so that comments won't
    get included into Makefile.in's anymore
  * c/update-tools/* automake support (NEW)
  * ./autogen update/enhancement (cf. ./autogen for details)

  After applying this patch please run:

    ./autogen
    cvs add c/update-tools/configure.in
    cvs add c/update-tools/Makefile.am
    cvs add c/update-tools/aclocal.m4
---
 automake/local.am   | 21 +++++++++++++++------
 automake/subdirs.am | 25 +++++++++++++++----------
 2 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'automake')

diff --git a/automake/local.am b/automake/local.am
index b1d7613684..80a7453cd7 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -1,9 +1,9 @@
-# $Id$
+## $Id$
 
-# NOTE: This is a temporary work-around to keep 
-# "make debug" and "make debug_install" working.
-# Once automake is fully integrated these make targets 
-# and this file will probably be removed
+## NOTE: This is a temporary work-around to keep 
+## "make debug" and "make debug_install" working.
+## Once automake is fully integrated these make targets 
+## and this file will probably be removed
 
 debug-am:
 
@@ -13,6 +13,8 @@ debug_install-am:
 
 debug_install: debug_install-am
 
+.PHONY: debug debug_install debug-am
+
 
 profile-am:
 
@@ -22,5 +24,12 @@ profile_install-am:
 
 profile_install: profile_install-am
 
+.PHONY: profile profile_install profile-am
+
+
+preinstall-am:
+
+preinstall: preinstall-am
+
+.PHONY: preinstall preinstall-am
 
-.PHONY: debug debug_install profile profile_install
diff --git a/automake/subdirs.am b/automake/subdirs.am
index cdfe3f9409..267fa24025 100644
--- a/automake/subdirs.am
+++ b/automake/subdirs.am
@@ -1,14 +1,14 @@
-# $Id$
+## $Id$
 
-# Borrowed from automake-1.4, adapted to support RTEMS's 
-# "make debug", "make debug_install", "make profile", "make profile_install"
-
-# NOTE: This is a temporary work-around to keep 
-# "make debug" and "make debug_install" working.
-# Once automake is fully integrated these make targets 
-# and this file will probably be removed
+## Borrowed from automake-1.4, adapted to support RTEMS's 
+## "make debug", "make debug_install", "make profile", "make profile_install"
 
+## NOTE: This is a temporary work-around to keep 
+## "make debug" and "make debug_install" working.
+## Once automake is fully integrated these make targets 
+## and this file will probably be removed
 
+preinstall-recursive \
 debug-recursive debug_install-recursive \
 profile-recursive profile_install-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
@@ -39,6 +39,11 @@ profile: profile-recursive
 
 profile_install: profile_install-recursive
 
+preinstall: preinstall-recursive
+
 .PHONY: \
-debug debug-recursive debug_install \
-profile profile-recursive profile_install
+debug debug-recursive \
+debug_install \
+profile profile-recursive \
+profile_install \
+preinstall preinstall-recursive
-- 
cgit v1.2.3