summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:33:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:33:09 +0000
commit792eb742961f9195051e0eadf7fa171ca01cfc37 (patch)
tree0bf7985df6f1ca61322591057004ffed2e9865cf /c/src
parent2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-792eb742961f9195051e0eadf7fa171ca01cfc37.tar.bz2
2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/Makefile.am, include/rtems/score/Makefile.am, inline/rtems/score/Makefile.am, macros/rtems/score/Makefile.am Apply include_*HEADERS instead of H_FILES.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/exec/score/ChangeLog6
-rw-r--r--c/src/exec/score/include/rtems/Makefile.am6
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.am10
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.am8
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.am12
5 files changed, 28 insertions, 14 deletions
diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index f3ec791c28..3aa52d9647 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,4 +1,10 @@
+2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/rtems/Makefile.am, include/rtems/score/Makefile.am,
+ inline/rtems/score/Makefile.am, macros/rtems/score/Makefile.am
+ Apply include_*HEADERS instead of H_FILES.
+
2001-01-29 Joel Sherrill <joel@OARcorp.com>
* src/objectextendinformation.c: Added include of string.h to
diff --git a/c/src/exec/score/include/rtems/Makefile.am b/c/src/exec/score/include/rtems/Makefile.am
index a2e0bbc47f..0316c02518 100644
--- a/c/src/exec/score/include/rtems/Makefile.am
+++ b/c/src/exec/score/include/rtems/Makefile.am
@@ -4,12 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = debug.h system.h seterr.h
+include_rtemsdir = $(includedir)/rtems
-noinst_HEADERS = $(H_FILES)
+include_rtems_HEADERS = debug.h system.h seterr.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am
index 06445c193a..d52738d508 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.am
+++ b/c/src/exec/score/include/rtems/score/Makefile.am
@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtems_scoredir = $(includedir)/rtems/score
+
# We only build multiprocessing related files if HAS_MP was defined
MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
@@ -14,13 +16,13 @@ STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h \
userext.h watchdog.h wkspace.h
if HAS_MP
-H_FILES = $(STD_H_FILES) $(MP_H_FILES) cpuopts.h
+include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) cpuopts.h
else
-H_FILES = $(STD_H_FILES) cpuopts.h
+include_rtems_score_HEADERS = $(STD_H_FILES) cpuopts.h
endif
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE)/rtems/score:
@$(mkinstalldirs) $@
@@ -44,6 +46,4 @@ cpuopts.h: cpuopts-tmp.h
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = $(STD_H_FILES) $(MP_H_FILES)
-
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.am b/c/src/exec/score/inline/rtems/score/Makefile.am
index 6b6083f625..ccedd88c6d 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.am
+++ b/c/src/exec/score/inline/rtems/score/Makefile.am
@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtems_scoredir = $(includedir)/rtems/score
+
## We only build multiprocessing related files if HAS_MP was defined
MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
@@ -18,11 +20,11 @@ else
I_FILES = $(STD_I_FILES)
endif
-noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
+include_rtems_score_HEADERS = $(I_FILES)
if INLINE
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
- $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE)/rtems/score:
@$(mkinstalldirs) $@
@@ -32,4 +34,6 @@ endif
all-local: $(PREINSTALL_FILES)
+EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
+
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.am b/c/src/exec/score/macros/rtems/score/Makefile.am
index 87cac6f169..06240466ee 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.am
+++ b/c/src/exec/score/macros/rtems/score/Makefile.am
@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtems_scoredir = $(includedir)/rtems/score
+
## We only build multiprocessing related files if HAS_MP was defined
MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
@@ -12,17 +14,17 @@ STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
wkspace.inl
-noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
if MACROS
if HAS_MP
-I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+include_rtems_score_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
else
-I_FILES = $(STD_I_FILES)
+include_rtems_score_HEADERS = $(STD_I_FILES)
endif
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
- $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE)/rtems/score:
@$(mkinstalldirs) $@
@@ -32,4 +34,6 @@ endif
all-local: $(PREINSTALL_FILES)
+EXTRA_DIST = $(I_FILES)
+
include $(top_srcdir)/../../../automake/local.am