From ff61414ac86ec7097a1c39a6904dacddf6f90599 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Oct 2001 13:30:52 +0000 Subject: 2001-10-16 Ralf Corsepius * include/rtems/Makefile.am: Remove. * include/rtems/Makefile.am: Remove. * include/Makefile.am: Handle subdirs, require automake-1.5. * macros/rtems/Makefile.am: Remove. * macros/rtems/score/Makefile.am: Remove. * macros/Makefile.am: Handle subdirs, require automake-1.5. * inline/rtems/Makefile.am: Remove. * inline/rtems/score/Makefile.am: Remove. * inline/Makefile.am: Handle subdirs, require automake-1.5. * Makefile.am: require automake-1.5 --- c/src/exec/score/inline/Makefile.am | 40 +++++++++++++++++++++++-- c/src/exec/score/inline/rtems/Makefile.am | 10 ------- c/src/exec/score/inline/rtems/score/Makefile.am | 39 ------------------------ 3 files changed, 37 insertions(+), 52 deletions(-) delete mode 100644 c/src/exec/score/inline/rtems/Makefile.am delete mode 100644 c/src/exec/score/inline/rtems/score/Makefile.am (limited to 'c/src/exec/score/inline') diff --git a/c/src/exec/score/inline/Makefile.am b/c/src/exec/score/inline/Makefile.am index 0c97211587..1bd2cecc7f 100644 --- a/c/src/exec/score/inline/Makefile.am +++ b/c/src/exec/score/inline/Makefile.am @@ -2,9 +2,43 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +include_rtems_scoredir = $(includedir)/rtems/score + +$(PROJECT_INCLUDE)/rtems/score: + @$(mkinstalldirs) $@ + +## We only build multiprocessing related files if HAS_MP was defined +MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl + +STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \ + rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \ + rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \ + rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \ + rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \ + rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \ + rtems/score/wkspace.inl + +if HAS_MP +I_FILES = $(STD_I_FILES) $(MP_I_FILES) +else +I_FILES = $(STD_I_FILES) +endif + +if INLINE +include_rtems_score_HEADERS = $(I_FILES) + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) + +endif + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/score/inline/rtems/Makefile.am b/c/src/exec/score/inline/rtems/Makefile.am deleted file mode 100644 index 7a6308aaf5..0000000000 --- a/c/src/exec/score/inline/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../automake/subdirs.am -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 deleted file mode 100644 index 785116b55e..0000000000 --- a/c/src/exec/score/inline/rtems/score/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## -## $Id$ -## - -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 - -STD_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 - -if HAS_MP -I_FILES = $(STD_I_FILES) $(MP_I_FILES) -else -I_FILES = $(STD_I_FILES) -endif - -include_rtems_score_HEADERS = $(I_FILES) - -if INLINE -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%) - -$(PROJECT_INCLUDE)/rtems/score: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl - $(INSTALL_DATA) $< $@ -endif - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3