summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/sapi/ChangeLog8
-rw-r--r--cpukit/sapi/Makefile.am80
-rw-r--r--cpukit/sapi/include/Makefile.am34
-rw-r--r--cpukit/sapi/inline/Makefile.am22
-rw-r--r--cpukit/sapi/macros/Makefile.am22
-rw-r--r--cpukit/sapi/src/Makefile.am32
6 files changed, 86 insertions, 112 deletions
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index 784a5faf0f..bde36ba992 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/Makefile.am: Remove.
+ * inline/Makefile.am: Remove.
+ * macros/Makefile.am: Remove.
+ * src/Makefile.am: Remove.
+ * Makefile.am: Merge-in removed Makefile.ams.
+
2002-08-30 Joel Sherrill <joel@OARcorp.com>
* src/io.c: Fixed some spacing.
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 30e4cd2773..592a081fa7 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -2,8 +2,84 @@
## $Id$
##
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
-SUBDIRS = include inline macros src
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: include/%.h
+ $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl
+ $(INSTALL_DATA) $< $@
+
+include_HEADERS = include/confdefs.h
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)
+PREINSTALL_FILES += $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
+
+include_rtemsdir = $(includedir)/rtems
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+
+include_rtems_HEADERS = include/rtems/config.h include/rtems/extension.h \
+ include/rtems/fatal.h \
+ include/rtems/init.h include/rtems/io.h include/rtems/mptables.h \
+ include/rtems/sptables.h
+
+PREINSTALL_FILES += $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
+
+EXTRA_DIST = include/rtems/README
+
+include/rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in
+ cd $(top_builddir) && CONFIG_FILES=sapi/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+
+## inline
+
+inline_H_FILES = inline/rtems/extension.inl
+noinst_HEADERS = $(inline_H_FILES)
+
+if INLINE
+PREINSTALL_FILES += $(inline_H_FILES:inline/%=$(PROJECT_INCLUDE)/%)
+include_rtems_HEADERS += $(inline_H_FILES)
+endif
+
+## macros
+macros_H_FILES = macros/rtems/extension.inl
+noinst_HEADERS += $(macros_H_FILES)
+
+if MACROS
+PREINSTALL_FILES += $(macros_H_FILES:macros/%=$(PROJECT_INCLUDE)/%)
+include_rtems_HEADERS += $(macros_H_FILES)
+endif
+
+## src
+
+LIB=$(ARCH)/libsapi.a
+
+EXTENSION_FILES = src/extension.c src/extensioncreate.c src/extensiondelete.c \
+ src/extensionident.c
+C_FILES = src/debug.c $(EXTENSION_FILES) src/fatal.c src/exinit.c src/io.c \
+ src/itronapi.c src/posixapi.c src/rtemsapi.c
+OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+
+all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB)
+
+$(LIB): ${OBJS}
+ $(make-library)
+
+${ARCH}/%.$(OBJEXT): src/%.c
+ test -d $(ARCH) || mkdir $(ARCH)
+ ${COMPILE} -o $@ -c $<
+
+EXTRA_DIST += $(C_FILES)
-include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/include/Makefile.am b/cpukit/sapi/include/Makefile.am
deleted file mode 100644
index b41bb64295..0000000000
--- a/cpukit/sapi/include/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## $Id$
-##
-
-
-$(PROJECT_INCLUDE):
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-include_HEADERS = confdefs.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
- $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/config.h rtems/extension.h rtems/fatal.h \
- rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-EXTRA_DIST = rtems/README
-
-rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in
- cd $(top_builddir) && CONFIG_FILES=sapi/include/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/inline/Makefile.am b/cpukit/sapi/inline/Makefile.am
deleted file mode 100644
index 860ea46bc6..0000000000
--- a/cpukit/sapi/inline/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-
-include_rtemsdir = $(includedir)/rtems
-
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%: %
- $(INSTALL_DATA) $< $@
-
-if INLINE
-include_rtems_HEADERS = rtems/extension.inl
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/macros/Makefile.am b/cpukit/sapi/macros/Makefile.am
deleted file mode 100644
index ba9fe74460..0000000000
--- a/cpukit/sapi/macros/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-
-include_rtemsdir = $(includedir)/rtems
-
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%: %
- $(INSTALL_DATA) $< $@
-
-if MACROS
-include_rtems_HEADERS = rtems/extension.inl
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/src/Makefile.am b/cpukit/sapi/src/Makefile.am
deleted file mode 100644
index de8da93902..0000000000
--- a/cpukit/sapi/src/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## $Id$
-##
-
-LIB=$(ARCH)/libsapi.a
-
-EXTENSION_FILES = extension.c extensioncreate.c extensiondelete.c \
- extensionident.c
-C_FILES = debug.c $(EXTENSION_FILES) fatal.c exinit.c io.c \
- itronapi.c posixapi.c rtemsapi.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/lib.am
-
-#
-# Add local stuff here using +=
-#
-
-AM_CPPFLAGS += -D__RTEMS_INSIDE__
-
-all-local: ${ARCH} $(LIB)
-
-$(LIB): ${OBJS}
- $(make-library)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/automake/local.am