diff options
Diffstat (limited to 'c/src/exec')
45 files changed, 173 insertions, 168 deletions
diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in index 8701a1c634..a022f79567 100644 --- a/c/src/exec/configure.in +++ b/c/src/exec/configure.in @@ -53,6 +53,7 @@ else fi AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" ) AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" ) +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" ) AC_SUBST(RTEMS_VERSION) diff --git a/c/src/exec/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am index f83468dd1b..a12590301a 100644 --- a/c/src/exec/itron/include/Makefile.am +++ b/c/src/exec/itron/include/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = itron.h +H_FILES = itron.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -17,9 +17,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) SUBDIRS = rtems itronsys diff --git a/c/src/exec/itron/include/itronsys/Makefile.am b/c/src/exec/itron/include/itronsys/Makefile.am index c7a7286285..25bcd64a2a 100644 --- a/c/src/exec/itron/include/itronsys/Makefile.am +++ b/c/src/exec/itron/include/itronsys/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h \ +H_FILES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h \ port.h semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/itronsys \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%) @@ -18,8 +18,8 @@ $(PROJECT_INCLUDE)/itronsys: $(PROJECT_INCLUDE)/itronsys/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/itron/include/rtems/itron/Makefile.am b/c/src/exec/itron/include/rtems/itron/Makefile.am index d295a8b02d..542ea135fd 100644 --- a/c/src/exec/itron/include/rtems/itron/Makefile.am +++ b/c/src/exec/itron/include/rtems/itron/Makefile.am @@ -4,24 +4,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \ +H_FILES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \ msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h \ task.h time.h vmempool.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/itron \ -$(H_PIECES:%=$(PROJECT_INCLUDE)/rtems/itron/%) +$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%) $(PROJECT_INCLUDE)/rtems/itron: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/itron/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) EXTRA_DIST = README diff --git a/c/src/exec/itron/inline/rtems/itron/Makefile.am b/c/src/exec/itron/inline/rtems/itron/Makefile.am index 52a0ec2de6..659227b218 100644 --- a/c/src/exec/itron/inline/rtems/itron/Makefile.am +++ b/c/src/exec/itron/inline/rtems/itron/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE -I_PIECES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \ +I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \ network.inl port.inl semaphore.inl sysmgmt.inl task.inl \ time.inl vmempool.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/itron \ -$(I_PIECES:%=$(PROJECT_INCLUDE)/rtems/itron/%) +$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%) $(PROJECT_INCLUDE)/rtems/itron: @$(mkinstalldirs) $@ @@ -20,8 +20,8 @@ $(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/librpc/include/rpc/Makefile.am b/c/src/exec/librpc/include/rpc/Makefile.am index a4753a7ba5..49b4706d1e 100644 --- a/c/src/exec/librpc/include/rpc/Makefile.am +++ b/c/src/exec/librpc/include/rpc/Makefile.am @@ -5,11 +5,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 if HAS_NETWORKING -H_PIECES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h +H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rpc \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rpc/%) @@ -19,8 +19,8 @@ $(PROJECT_INCLUDE)/rpc/%.h: %.h $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/posix/configure.in b/c/src/exec/posix/configure.in index 3ca21f4d9c..84e04baadf 100644 --- a/c/src/exec/posix/configure.in +++ b/c/src/exec/posix/configure.in @@ -14,7 +14,6 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX -RTEMS_ENABLE_POSIX RTEMS_ENABLE_INLINES RTEMS_ENV_RTEMSBSP @@ -48,6 +47,7 @@ else fi AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" ) AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" ) +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" ) ## Needed when using automake for libs/rels RTEMS_CHECK_NEWLIB diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am index 57e98bd79d..01adb60973 100644 --- a/c/src/exec/posix/include/Makefile.am +++ b/c/src/exec/posix/include/Makefile.am @@ -6,11 +6,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 ## RTEMS unistd.h needs to be checked against newlib's and removed #noinst_HEADERS= devctl.h intr.h -H_PIECES = pthread.h sched.h aio.h mqueue.h semaphore.h +H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -19,9 +19,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) SUBDIRS = rtems sys diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.am b/c/src/exec/posix/include/rtems/posix/Makefile.am index accf79b5ed..59bf3c281d 100644 --- a/c/src/exec/posix/include/rtems/posix/Makefile.am +++ b/c/src/exec/posix/include/rtems/posix/Makefile.am @@ -4,28 +4,29 @@ AUTOMAKE_OPTIONS = foreign 1.4 +if HAS_MP ## We only build multiprocessing related files if HAS_MP was defined -MP_H_PIECES_yes_V = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h -MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) +MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h +endif -H_PIECES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \ +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_PIECES) -#H_PIECES= intr.h threadsup.h time.h + time.h timer.h $(MP_H_FILES) +#H_FILES= intr.h threadsup.h time.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/posix \ -$(H_PIECES:%=$(PROJECT_INCLUDE)/rtems/posix/%) +$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%) $(PROJECT_INCLUDE)/rtems/posix: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/posix/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) 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 04a1fc00c7..2ac2975304 100644 --- a/c/src/exec/posix/include/sys/Makefile.am +++ b/c/src/exec/posix/include/sys/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = utsname.h +H_FILES = utsname.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/sys \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) @@ -17,8 +17,8 @@ $(PROJECT_INCLUDE)/sys: $(PROJECT_INCLUDE)/sys/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am index 01c6016324..be7b9cf367 100644 --- a/c/src/exec/posix/inline/rtems/posix/Makefile.am +++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE -#I_PIECES= intr.inl -I_PIECES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \ +#I_FILES= intr.inl +I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \ semaphore.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/posix \ -$(I_PIECES:%=$(PROJECT_INCLUDE)/rtems/posix/%) +$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%) $(PROJECT_INCLUDE)/rtems/posix: @$(mkinstalldirs) $@ @@ -20,9 +20,9 @@ $(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) EXTRA_DIST = intr.inl diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.am b/c/src/exec/posix/macros/rtems/posix/Makefile.am index 3b563a0132..32f810b57c 100644 --- a/c/src/exec/posix/macros/rtems/posix/Makefile.am +++ b/c/src/exec/posix/macros/rtems/posix/Makefile.am @@ -5,13 +5,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 if MACROS -I_PIECES = +I_FILES = -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/posix \ -$(I_PIECES:%=$(PROJECT_INCLUDE)/rtems/posix/%) +$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%) $(PROJECT_INCLUDE)/rtems/posix: @$(mkinstalldirs) $@ @@ -19,8 +19,8 @@ $(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/exec/rtems/include/Makefile.am b/c/src/exec/rtems/include/Makefile.am index 11a9596ea1..8935b30100 100644 --- a/c/src/exec/rtems/include/Makefile.am +++ b/c/src/exec/rtems/include/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = rtems.h +H_FILES = rtems.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -17,9 +17,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) SUBDIRS = rtems diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am index 94667686bd..4afbdd0695 100644 --- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am +++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am @@ -5,17 +5,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 ## We only build multiprocessing related files if HAS_MP was defined -MP_H_PIECES_yes_V = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \ +if HAS_MP +MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \ signalmp.h taskmp.h -MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) +endif -H_PIECES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \ +H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \ message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \ - signal.h status.h support.h tasks.h timer.h types.h $(MP_H_PIECES) + signal.h status.h support.h tasks.h timer.h types.h $(MP_H_FILES) -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%) @@ -24,8 +25,8 @@ $(PROJECT_INCLUDE)/rtems/rtems: $(PROJECT_INCLUDE)/rtems/rtems/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am index b028bc6f39..44dde4db1b 100644 --- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am +++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am @@ -5,13 +5,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE -I_PIECES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \ +I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \ modes.inl options.inl part.inl ratemon.inl \ region.inl sem.inl status.inl support.inl tasks.inl timer.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%) @@ -21,8 +21,8 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am index 140cb794d6..f738254bfc 100644 --- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am +++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am @@ -5,13 +5,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 if MACROS -I_PIECES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \ +I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \ modes.inl options.inl part.inl ratemon.inl \ region.inl sem.inl status.inl support.inl tasks.inl timer.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%) @@ -21,8 +21,8 @@ $(PROJECT_INCLUDE)/rtems/rtems/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/include/Makefile.am b/c/src/exec/sapi/include/Makefile.am index 51835ffd51..5391ab5d89 100644 --- a/c/src/exec/sapi/include/Makefile.am +++ b/c/src/exec/sapi/include/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = confdefs.h +H_FILES = confdefs.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -17,9 +17,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) SUBDIRS = rtems diff --git a/c/src/exec/sapi/include/rtems/Makefile.am b/c/src/exec/sapi/include/rtems/Makefile.am index d7f9dc5f8c..deabd8b0b5 100644 --- a/c/src/exec/sapi/include/rtems/Makefile.am +++ b/c/src/exec/sapi/include/rtems/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = config.h directives.h extension.h fatal.h init.h io.h mptables.h \ +H_FILES = config.h directives.h extension.h fatal.h init.h io.h mptables.h \ sptables.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) @@ -20,8 +20,8 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h EXTRA_DIST = README -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/inline/rtems/Makefile.am b/c/src/exec/sapi/inline/rtems/Makefile.am index 8861489f1a..804d5be2f9 100644 --- a/c/src/exec/sapi/inline/rtems/Makefile.am +++ b/c/src/exec/sapi/inline/rtems/Makefile.am @@ -5,11 +5,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE -I_PIECES = extension.inl +I_FILES = extension.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) @@ -19,8 +19,8 @@ $(PROJECT_INCLUDE)/rtems/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/macros/rtems/Makefile.am b/c/src/exec/sapi/macros/rtems/Makefile.am index f888f6db5a..962bf5aec0 100644 --- a/c/src/exec/sapi/macros/rtems/Makefile.am +++ b/c/src/exec/sapi/macros/rtems/Makefile.am @@ -5,11 +5,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 if MACROS -I_PIECES = extension.inl +I_FILES = extension.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) @@ -19,8 +19,8 @@ $(PROJECT_INCLUDE)/rtems/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in index c86a39c891..1471cb849f 100644 --- a/c/src/exec/score/cpu/Makefile.in +++ b/c/src/exec/score/cpu/Makefile.in @@ -17,7 +17,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = $(RTEMS_CPU) +SUBDIRS = $(RTEMS_CPU) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in index b49d12281e..9d25ef141f 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.in +++ b/c/src/exec/score/cpu/a29k/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/Makefile.in index 4f188085e4..7de8275a43 100644 --- a/c/src/exec/score/cpu/a29k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/a29k/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in index 9fd465d06e..32ee656fc4 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in index 83a715b8ff..5e86c88f7e 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in index 46e20d4b20..301ceb8459 100644 --- a/c/src/exec/score/cpu/i386/Makefile.in +++ b/c/src/exec/score/cpu/i386/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/i386/rtems/Makefile.in b/c/src/exec/score/cpu/i386/rtems/Makefile.in index 614e078ddf..202c740086 100644 --- a/c/src/exec/score/cpu/i386/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i386/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in index 0909ee5152..a7d8e221d0 100644 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ b/c/src/exec/score/cpu/i960/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in index 07fb1d4666..e16f379a56 100644 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in index 2742dd8304..13ba612f57 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.in +++ b/c/src/exec/score/cpu/m68k/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in index 7620aa41d4..5cc6fcd10c 100644 --- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in index 8fc33037ad..f40d528e50 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in index ac54958e90..2ee69101d6 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in index b23b7ee74b..7a9a785b50 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in index 15366b5b7d..aff4d23703 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in index f4f7321734..73f5c47a02 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/Makefile.in @@ -26,7 +26,7 @@ else CPUDIR = other_cpu endif -SUB_DIRS = $(CPUDIR) $(SHARED_LIB) +SUBDIRS = $(CPUDIR) $(SHARED_LIB) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in index ef3e2fac5e..820f1dcfc6 100644 --- a/c/src/exec/score/cpu/sh/Makefile.in +++ b/c/src/exec/score/cpu/sh/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in index cecda53eb9..0ce0681963 100644 --- a/c/src/exec/score/cpu/sh/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sh/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in index c4c119539e..0d89a0f51b 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.in +++ b/c/src/exec/score/cpu/sparc/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in index fd1d96e01d..0cd9e3af8b 100644 --- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in index b2768c4305..efef7da8aa 100644 --- a/c/src/exec/score/cpu/unix/Makefile.in +++ b/c/src/exec/score/cpu/unix/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = rtems wrap +SUBDIRS = rtems wrap Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in index c6aa65787e..8cc26059bd 100644 --- a/c/src/exec/score/cpu/unix/rtems/Makefile.in +++ b/c/src/exec/score/cpu/unix/rtems/Makefile.in @@ -18,7 +18,7 @@ include $(RTEMS_ROOT)/make/directory.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ -SUB_DIRS = score +SUBDIRS = score Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/exec/score/include/rtems/Makefile.am b/c/src/exec/score/include/rtems/Makefile.am index b6ed4206e8..f09b99a313 100644 --- a/c/src/exec/score/include/rtems/Makefile.am +++ b/c/src/exec/score/include/rtems/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = debug.h system.h +H_FILES = debug.h system.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) @@ -17,9 +17,9 @@ $(PROJECT_INCLUDE)/rtems: $(PROJECT_INCLUDE)/rtems/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) SUBDIRS = score diff --git a/c/src/exec/score/inline/rtems/score/Makefile.am b/c/src/exec/score/inline/rtems/score/Makefile.am index 61a34527dc..1db2dcec4d 100644 --- a/c/src/exec/score/inline/rtems/score/Makefile.am +++ b/c/src/exec/score/inline/rtems/score/Makefile.am @@ -6,17 +6,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE ## We only build multiprocessing related files if HAS_MP was defined -MP_I_PIECES_yes_V = mppkt.inl objectmp.inl threadmp.inl -MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) +if HAS_MP +MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl +endif -I_PIECES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \ +I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \ heap.inl isr.inl object.inl priority.inl stack.inl states.inl \ sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \ - wkspace.inl $(MP_I_PIECES) + wkspace.inl $(MP_I_FILES) -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/score \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%) @@ -26,8 +27,8 @@ $(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_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 fbec0357ac..05cc4ea5a1 100644 --- a/c/src/exec/score/macros/rtems/score/Makefile.am +++ b/c/src/exec/score/macros/rtems/score/Makefile.am @@ -7,18 +7,19 @@ AUTOMAKE_OPTIONS = foreign 1.4 EXTRA_DIST = README if MACROS +if HAS_MP ## We only build multiprocessing related files if HAS_MP was defined -MP_I_PIECES_yes_V = mppkt.inl objectmp.inl threadmp.inl -MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) +MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl +endif -I_PIECES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \ +I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \ isr.inl object.inl priority.inl stack.inl states.inl sysstate.inl \ thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl \ - $(MP_I_PIECES) + $(MP_I_FILES) -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -28,8 +29,8 @@ $(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl $(INSTALL_DATA) $< $@ endif -all-am: $(TMPINSTALL_FILES) -debug-am: $(TMPINSTALL_FILES) -profile-am: $(TMPINSTALL_FILES) +all-am: $(PREINSTALL_FILES) +debug-am: $(PREINSTALL_FILES) +profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am |