summaryrefslogtreecommitdiffstats
path: root/cpukit/sapi
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-11-23 10:24:09 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-11-23 10:24:09 +0000
commit8b273c20dbdbf0e5b2fa995028ce49429d71d9eb (patch)
treef2acd3e9f67f076c179a524fd48a16a572875464 /cpukit/sapi
parent2003-11-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-8b273c20dbdbf0e5b2fa995028ce49429d71d9eb.tar.bz2
2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reworked.
Diffstat (limited to 'cpukit/sapi')
-rw-r--r--cpukit/sapi/ChangeLog4
-rw-r--r--cpukit/sapi/Makefile.am88
2 files changed, 60 insertions, 32 deletions
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index 62993feac0..ff2f1abd65 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Reworked.
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* include/confdefs.h, include/rtems/config.h,
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 5d66a261e2..8ad30339d9 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -6,58 +6,32 @@ include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
-$(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)/%)
+ include/rtems/fatal.h include/rtems/init.h include/rtems/io.h \
+ include/rtems/mptables.h include/rtems/sptables.h
EXTRA_DIST = include/rtems/README
## 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)
+include_rtems_HEADERS += inline/rtems/extension.inl
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)
+include_rtems_HEADERS += macros/rtems/extension.inl
endif
## src
LIB=$(ARCH)/libsapi.a
-EXTENSION_FILES = src/extension.c src/extensioncreate.c src/extensiondelete.c \
- src/extensionident.c
+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))
@@ -78,4 +52,54 @@ ${ARCH}/%.$(OBJEXT): src/%.c
EXTRA_DIST += $(C_FILES)
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/confdefs.h: include/confdefs.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/confdefs.h
+
+$(PROJECT_INCLUDE)/rtems:
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+
+$(PROJECT_INCLUDE)/rtems/config.h: include/rtems/config.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/config.h
+
+$(PROJECT_INCLUDE)/rtems/extension.h: include/rtems/extension.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.h
+
+$(PROJECT_INCLUDE)/rtems/fatal.h: include/rtems/fatal.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fatal.h
+
+$(PROJECT_INCLUDE)/rtems/init.h: include/rtems/init.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/init.h
+
+$(PROJECT_INCLUDE)/rtems/io.h: include/rtems/io.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/io.h
+
+$(PROJECT_INCLUDE)/rtems/mptables.h: include/rtems/mptables.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mptables.h
+
+$(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
+
+if INLINE
+$(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
+endif
+
+if MACROS
+$(PROJECT_INCLUDE)/rtems/extension.inl: macros/rtems/extension.inl
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
+endif
+
include $(top_srcdir)/automake/local.am