summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2021-11-25 23:54:16 +0300
committerIvan Maidanski <ivmai@mail.ru>2021-11-25 23:54:16 +0300
commit8199a20978e5a3f637ca61975d6e81632b0113cb (patch)
treec0f220212f4f28c19b3c5aa84f824d5e51a127c9
parent07d08b8151401ef87792ff1f130b2fad738f306f (diff)
downloadbdwgc-8199a20978e5a3f637ca61975d6e81632b0113cb.tar.gz
Remove doc.am and move gc.man to base folder
(refactoring) This is to eliminate non-dist-doc files in doc folder. * CMakeLists.txt [enable_docs] (doc/gc.man): Rename to gc.man. * Makefile.am [ENABLE_DOCS] (dist_man3_MANS): Likewise. * Makefile.direct (BSD-pkg-install): Likewise. * Makefile.am: Do not include doc/doc.am. * Makefile.am [ENABLE_DOCS] (dist_doc_DATA, dist_man3_MANS): Copy assignment from doc.am. * doc/doc.am: Remove. * doc/gc.man: Rename to gc.man.
-rw-r--r--CMakeLists.txt3
-rw-r--r--Makefile.am44
-rw-r--r--Makefile.direct2
-rw-r--r--doc/doc.am53
-rw-r--r--gc.man (renamed from doc/gc.man)0
5 files changed, 45 insertions, 57 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 495a1c7b..82f3ec1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -730,8 +730,7 @@ if (enable_docs)
PATTERN "README.*"
PATTERN "*.md")
- install(FILES doc/gc.man DESTINATION "${CMAKE_INSTALL_MANDIR}/man3"
- RENAME gc.3)
+ install(FILES gc.man DESTINATION "${CMAKE_INSTALL_MANDIR}/man3" RENAME gc.3)
endif(enable_docs)
# CMake config/targets files.
diff --git a/Makefile.am b/Makefile.am
index a8f690c3..0859fecd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -206,9 +206,51 @@ EXTRA_DIST += tools/if_mach.c tools/if_not_there.c tools/setjmp_t.c \
include include/include.am
include cord/cord.am
include tests/tests.am
-include doc/doc.am
+
## Putting these at the top causes cord to be built first, and not find
## libgc.a on HP/UX. There may be a better fix.
+# Installed documentation.
+if ENABLE_DOCS
+dist_doc_DATA = \
+ AUTHORS \
+ LICENSE \
+ README.md \
+ doc/README.DGUX386 \
+ doc/README.Mac \
+ doc/README.OS2 \
+ doc/README.aix \
+ doc/README.amiga \
+ doc/README.arm.cross \
+ doc/README.autoconf \
+ doc/README.cmake \
+ doc/README.cords \
+ doc/README.darwin \
+ doc/README.emscripten \
+ doc/README.environment \
+ doc/README.ews4800 \
+ doc/README.hp \
+ doc/README.linux \
+ doc/README.macros \
+ doc/README.sgi \
+ doc/README.solaris2 \
+ doc/README.symbian \
+ doc/README.uts \
+ doc/README.win32 \
+ doc/README.win64 \
+ doc/debugging.md \
+ doc/finalization.md \
+ doc/gcdescr.md \
+ doc/gcinterface.md \
+ doc/leak.md \
+ doc/overview.md \
+ doc/porting.md \
+ doc/scale.md \
+ doc/simple_example.md \
+ doc/tree.md
+
+dist_man3_MANS = gc.man
+endif
+
# A dummy target for mono build.
test-bundle:
diff --git a/Makefile.direct b/Makefile.direct
index 4fc87dcd..b39c1f66 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -176,7 +176,7 @@ BSD-pkg-install: BSD-pkg-all
${CP} bsd-libgctba.a libgctba.a
${INSTALL_DATA} libgctba.a ${PREFIX}/lib
${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include
- ${INSTALL_MAN} doc/gc.man ${PREFIX}/man/man3/gc.3
+ ${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3
pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \
include/private/gc_locks.h include/gc.h include/private/gcconfig.h \
diff --git a/doc/doc.am b/doc/doc.am
deleted file mode 100644
index 9ec638d4..00000000
--- a/doc/doc.am
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
-#
-# Permission is hereby granted to use or copy this program
-# for any purpose, provided the above notices are retained on all copies.
-# Permission to modify the code and to distribute modified code is granted,
-# provided the above notices are retained, and a notice that the code was
-# modified is included with the above copyright notice.
-
-## Process this file with automake to produce Makefile.in.
-
-# installed documentation
-if ENABLE_DOCS
-dist_doc_DATA = \
- AUTHORS \
- LICENSE \
- README.md \
- doc/README.DGUX386 \
- doc/README.Mac \
- doc/README.OS2 \
- doc/README.aix \
- doc/README.amiga \
- doc/README.arm.cross \
- doc/README.autoconf \
- doc/README.cmake \
- doc/README.cords \
- doc/README.darwin \
- doc/README.emscripten \
- doc/README.environment \
- doc/README.ews4800 \
- doc/README.hp \
- doc/README.linux \
- doc/README.macros \
- doc/README.sgi \
- doc/README.solaris2 \
- doc/README.symbian \
- doc/README.uts \
- doc/README.win32 \
- doc/README.win64 \
- doc/debugging.md \
- doc/finalization.md \
- doc/gcdescr.md \
- doc/gcinterface.md \
- doc/leak.md \
- doc/overview.md \
- doc/porting.md \
- doc/scale.md \
- doc/simple_example.md \
- doc/tree.md
-
-dist_man3_MANS = doc/gc.man
-endif
diff --git a/doc/gc.man b/gc.man
index 640bd511..640bd511 100644
--- a/doc/gc.man
+++ b/gc.man