From 5428b10686487708a0b3074088312c82fd0af9bd Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 15 Dec 1998 23:40:53 +0000
Subject: More automake preparation changes from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de>.

---
 c/src/exec/sapi/Makefile.in               |  2 +-
 c/src/exec/sapi/include/Makefile.in       | 14 ++++++++++++++
 c/src/exec/sapi/include/rtems/Makefile.in |  7 +------
 c/src/exec/sapi/include/wrap/Makefile.in  | 30 ++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 c/src/exec/sapi/include/Makefile.in
 create mode 100644 c/src/exec/sapi/include/wrap/Makefile.in

(limited to 'c/src')

diff --git a/c/src/exec/sapi/Makefile.in b/c/src/exec/sapi/Makefile.in
index 0ef0ca0e76..72a335b4f4 100644
--- a/c/src/exec/sapi/Makefile.in
+++ b/c/src/exec/sapi/Makefile.in
@@ -11,4 +11,4 @@ PROJECT_ROOT = @PROJECT_ROOT@
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUB_DIRS=headers $(INLINE) optman src
+SUB_DIRS=include $(INLINE) optman src
diff --git a/c/src/exec/sapi/include/Makefile.in b/c/src/exec/sapi/include/Makefile.in
new file mode 100644
index 0000000000..78c23e2adc
--- /dev/null
+++ b/c/src/exec/sapi/include/Makefile.in
@@ -0,0 +1,14 @@
+#
+#  $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=wrap rtems
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
index 109bb18c44..f3bd27cb78 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ b/c/src/exec/sapi/include/rtems/Makefile.in
@@ -11,11 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 H_PIECES= config directives extension fatal init io mptables 
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 
-# H_FILES that get installed externally
-EXTERNAL_H_PIECES = confdefs 
-EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES) $(EXTERNAL_H_FILES)
+SRCS=$(H_FILES)
 
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
@@ -32,7 +28,6 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS) $(ARCH) $(PROJECT_INCLUDE)/rtems/sptables.h
 	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
 
 $(PROJECT_INCLUDE)/rtems/sptables.h: $(ARCH)/sptables.h-tmp
 	$(INSTALL) -m 444 $(ARCH)/sptables.h-tmp $@
diff --git a/c/src/exec/sapi/include/wrap/Makefile.in b/c/src/exec/sapi/include/wrap/Makefile.in
new file mode 100644
index 0000000000..4ae1cd6bdd
--- /dev/null
+++ b/c/src/exec/sapi/include/wrap/Makefile.in
@@ -0,0 +1,30 @@
+#
+#  $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+H_PIECES= confdefs
+H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
+
+SRCS=$(H_FILES)
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+#
+# Add your list of files to delete here.  The config files
+#  already know how to delete some stuff, so you may want
+#  to just run 'make clean' first to see what gets missed.
+#  'make clobber' already includes 'make clean'
+#
+
+CLEAN_ADDITIONS +=
+CLOBBER_ADDITIONS +=
+
+all:	$(SRCS)
+	$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-- 
cgit v1.2.3