summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:31:28 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:31:28 +0000
commit890f07cb8310463a56fd1a642d378ae98ea7913f (patch)
treec59416eebf7f338ffa6a270d16df6f884811cac5
parent9fae0f872d922e148b3d20837818aec343107755 (diff)
downloadrtems-890f07cb8310463a56fd1a642d378ae98ea7913f.tar.bz2
2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am, include/rtems/posix/Makefile.am, include/sys/Makefile.am, inline/rtems/posix/Makefile.am, macros/rtems/posix/Makefile.am: Apply include_*HEADERS instead of H_FILES.
-rw-r--r--c/src/exec/posix/ChangeLog7
-rw-r--r--c/src/exec/posix/include/Makefile.am12
-rw-r--r--c/src/exec/posix/include/rtems/posix/Makefile.am14
-rw-r--r--c/src/exec/posix/include/sys/Makefile.am6
-rw-r--r--c/src/exec/posix/inline/rtems/posix/Makefile.am12
-rw-r--r--c/src/exec/posix/macros/rtems/posix/Makefile.am10
-rw-r--r--cpukit/posix/ChangeLog7
-rw-r--r--cpukit/posix/include/Makefile.am12
8 files changed, 46 insertions, 34 deletions
diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog
index 8835d2f3ad..56481843ec 100644
--- a/c/src/exec/posix/ChangeLog
+++ b/c/src/exec/posix/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/Makefile.am, include/rtems/posix/Makefile.am,
+ include/sys/Makefile.am, inline/rtems/posix/Makefile.am,
+ macros/rtems/posix/Makefile.am:
+ Apply include_*HEADERS instead of H_FILES.
+
2001-01-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Add src/config.h
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index 16db0edd0d..7988a93e04 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -4,16 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-UNUSED_H_FILES = devctl.h intr.h
+noinst_HEADERS = devctl.h intr.h
-H_FILES = sched.h aio.h mqueue.h semaphore.h
-
-# H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
-
-noinst_HEADERS = $(H_FILES)
+include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES += $(PROJECT_INCLUDE) \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
@@ -24,7 +20,7 @@ all-local: $(PREINSTALL_FILES)
SUBDIRS = rtems sys
-EXTRA_DIST = $(UNUSED_H_FILES)
+EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.am b/c/src/exec/posix/include/rtems/posix/Makefile.am
index 0d0745ca07..a1a278facc 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.am
@@ -4,24 +4,24 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtems_posixdir = $(includedir)/rtems/posix
+
MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
priority.h psignal.h pthread.h ptimer.h semaphore.h threadsup.h time.h \
timer.h $(MP_H_FILES)
-UNUSED_H_FILES = intr.h threadsup.h
+noinst_HEADERS = intr.h threadsup.h
if HAS_MP
-H_FILES = $(STD_H_FILES) $(MP_H_FILES)
+include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
else
-H_FILES = $(STD_H_FILES)
+include_rtems_posix_HEADERS = $(STD_H_FILES)
endif
-noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
-
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
@@ -30,6 +30,6 @@ $(PROJECT_INCLUDE)/rtems/posix/%.h: %.h
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = $(UNUSED_H_FILES)
+EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/sys/Makefile.am b/c/src/exec/posix/include/sys/Makefile.am
index f07a7218b3..09821baec0 100644
--- a/c/src/exec/posix/include/sys/Makefile.am
+++ b/c/src/exec/posix/include/sys/Makefile.am
@@ -4,12 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = utsname.h
+include_sysdir = $(includedir)/sys
-noinst_HEADERS = $(H_FILES)
+include_sys_HEADERS = utsname.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
+ $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
index a479cf611b..3e6ba01d54 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am
@@ -4,15 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
-#I_FILES= intr.inl
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+noinst_HEADERS = intr.inl
I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
semaphore.inl timer.inl
-noinst_HEADERS = $(I_FILES)
-
if INLINE
+include_rtems_posix_HEADERS = $(I_FILES)
+
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
- $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
@@ -22,6 +24,6 @@ endif
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = intr.inl
+EXTRA_DIST = intr.inl $(I_FILES)
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.am b/c/src/exec/posix/macros/rtems/posix/Makefile.am
index e28b13e53c..a2ba29d25d 100644
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/macros/rtems/posix/Makefile.am
@@ -4,14 +4,16 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if MACROS
+include_rtems_posixdir = $(includedir)/rtems/posix
+
I_FILES = cond.inl intr.inl key.inl mqueue.inl mutex.inl priority.inl \
pthread.inl semaphore.inl timer.inl
-noinst_HEADERS = $(I_FILES)
+if MACROS
+include_rtems_posix_HEADERS = $(I_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
- $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
$(PROJECT_INCLUDE)/rtems/posix:
@$(mkinstalldirs) $@
@@ -21,4 +23,6 @@ endif
all-local: $(PREINSTALL_FILES)
+EXTRA_DIST = $(I_FILES)
+
include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 8835d2f3ad..56481843ec 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/Makefile.am, include/rtems/posix/Makefile.am,
+ include/sys/Makefile.am, inline/rtems/posix/Makefile.am,
+ macros/rtems/posix/Makefile.am:
+ Apply include_*HEADERS instead of H_FILES.
+
2001-01-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Add src/config.h
diff --git a/cpukit/posix/include/Makefile.am b/cpukit/posix/include/Makefile.am
index 16db0edd0d..7988a93e04 100644
--- a/cpukit/posix/include/Makefile.am
+++ b/cpukit/posix/include/Makefile.am
@@ -4,16 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-UNUSED_H_FILES = devctl.h intr.h
+noinst_HEADERS = devctl.h intr.h
-H_FILES = sched.h aio.h mqueue.h semaphore.h
-
-# H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
-
-noinst_HEADERS = $(H_FILES)
+include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES += $(PROJECT_INCLUDE) \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
@@ -24,7 +20,7 @@ all-local: $(PREINSTALL_FILES)
SUBDIRS = rtems sys
-EXTRA_DIST = $(UNUSED_H_FILES)
+EXTRA_DIST = $(noinst_HEADERS)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am