diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-23 13:29:04 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-23 13:29:04 +0000 |
| commit | fba12eb6ff4a91fcbac1c43dd3196114cc12756b (patch) | |
| tree | 34477c9b77ceab1ee81e0ea4a9ee9a6e3a3975cf /c/src/exec/posix/include | |
| parent | Added projects chapter to FAQ. (diff) | |
| download | rtems-fba12eb6ff4a91fcbac1c43dd3196114cc12756b.tar.bz2 | |
Patch rtems-rc-19991117-11.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
to convert the libc directory to automake and "dozens of
small fixes for Makefile.ins/configure.ins below c/src/lib."
Diffstat (limited to '')
| -rw-r--r-- | c/src/exec/posix/include/Makefile.am | 5 | ||||
| -rw-r--r-- | c/src/exec/posix/include/rtems/posix/Makefile.am | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am index 01adb60973..4abe5df1ee 100644 --- a/c/src/exec/posix/include/Makefile.am +++ b/c/src/exec/posix/include/Makefile.am @@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 ## RTEMS unistd.h needs to be checked against newlib's and removed -#noinst_HEADERS= devctl.h intr.h +UNUSED_H_FILES = devctl.h intr.h unistd.h + H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h noinst_HEADERS = $(H_FILES) @@ -25,7 +26,7 @@ profile-am: $(PREINSTALL_FILES) SUBDIRS = rtems sys -EXTRA_DIST = intr.h devctl.h +EXTRA_DIST = $(UNUSED_H_FILES) 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 59bf3c281d..96b9bad59b 100644 --- a/c/src/exec/posix/include/rtems/posix/Makefile.am +++ b/c/src/exec/posix/include/rtems/posix/Makefile.am @@ -4,17 +4,21 @@ AUTOMAKE_OPTIONS = foreign 1.4 -if HAS_MP -## We only build multiprocessing related files if HAS_MP was defined MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h -endif -H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.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 seterr.h threadsup.h \ time.h timer.h $(MP_H_FILES) -#H_FILES= intr.h threadsup.h time.h -noinst_HEADERS = $(H_FILES) +UNUSED_H_FILES= intr.h threadsup.h + +if HAS_MP +H_FILES = $(STD_H_FILES) $(MP_H_FILES) +else +H_FILES = $(STD_H_FILES) +endif + +noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES) PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/posix \ @@ -29,4 +33,6 @@ all-am: $(PREINSTALL_FILES) debug-am: $(PREINSTALL_FILES) profile-am: $(PREINSTALL_FILES) +EXTRA_DIST = $(UNUSED_H_FILES) + include $(top_srcdir)/../../../../automake/local.am |