diff options
Diffstat (limited to '')
-rw-r--r-- | scripts/rtems/Makefile.am | 6 | ||||
-rw-r--r-- | scripts/rtemsdoc/Makefile.am | 33 |
2 files changed, 14 insertions, 25 deletions
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am index 76fb8ff81f..83483dd940 100644 --- a/scripts/rtems/Makefile.am +++ b/scripts/rtems/Makefile.am @@ -35,9 +35,8 @@ sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS) TEMPLATES = rtems.spec.in -RPM_SPECS_DATA = \ - i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \ - m68k-rtems-gen68360-$(BSPVERS).spec \ +RPM_SPECS_DATA = i386-rtems-pc386-$(BSPVERS).spec \ + i960-rtems-cvme961-$(BSPVERS).spec m68k-rtems-gen68360-$(BSPVERS).spec \ mips64orion-rtems-p4600-$(BSPVERS).spec \ powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \ sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec @@ -47,4 +46,5 @@ noinst_DATA = $(TEMPLATES) EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) + include $(top_srcdir)/../automake/local.am diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am index a159833aae..abcdc9d0a6 100644 --- a/scripts/rtemsdoc/Makefile.am +++ b/scripts/rtemsdoc/Makefile.am @@ -8,26 +8,15 @@ CLEANFILES = MKSPEC = $(SHELL) ./mkspec -MKSPEC_DEPS = mkspec rtemsdoc.spec.in \ - $(top_builddir)/setup.cache - -SUPPLEMENTS = \ - arm \ - c4x \ - i386 \ - i960 \ - m68k \ - mips \ - mips64orion \ - powerpc \ - sh \ - sparc - -DOCS = ada_user posix1003_1 bsp_howto +MKSPEC_DEPS = mkspec rtemsdoc.spec.in $(top_builddir)/setup.cache + +SUPPLEMENTS = arm c4x i386 i960 m68k mips mips64orion powerpc sh sparc + +DOCS = ada_user posix1003_1 bsp_howto DOCS += c_user -DOCS += develenv +DOCS += develenv DOCS += FAQ filesystem itron -DOCS += networking porting new_chapters +DOCS += networking porting new_chapters DOCS += relnotes rgdb_specs rtems_gdb DOCS += started started_ada @@ -36,19 +25,19 @@ SUBPACKAGES += ../common/common.add SUBPACKAGES += rtemsdoc.add SUBPACKAGES += ../common/clean.add SUBPACKAGES += $(DOCS:%=%-docs.add) -CLEANFILES += $(DOCS:%=%-docs.add) +CLEANFILES += $(DOCS:%=%-docs.add) SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add) -CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add) +CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add) SUFFIXES = -supplement.add -docs.add %-supplement.add: supplement.add.in t=`echo $@ | sed -e 's,-supplement.add,,'`; \ - sed -e s/@target\@/$$t/g < $< >$@ + sed -e s/@target\@/$$t/g < $< >$@ %-docs.add: templ.add.in t=`echo $@ | sed -e 's,-docs.add,,'`; \ - sed -e s/@target\@/$$t/g < $< >$@ + sed -e s/@target\@/$$t/g < $< >$@ rtemsdoc.spec.in: $(SUBPACKAGES) cat $^ > $@ |