Commit 2359e122 authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Thomas Petazzoni
Browse files

Clean up naming of old GENTARGETS infrastructure 



With the renaming of XXXTARGETS to xxx-package, the names of the
pkg-xxx.mk files is inconsistent, as well as some internal names in
the documentation.  These inconsistencies are cleaned up here.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 ...kages-autotargets.txt => adding-packages-autotools.txt} |    4 ++--
 ...packages-cmaketargets.txt => adding-packages-cmake.txt} |    4 ++--
 docs/manual/adding-packages-directory.txt                  |   12 ++++++------
 ...packages-gentargets.txt => adding-packages-generic.txt} |    4 ++--
 docs/manual/adding-packages.txt                            |    6 +++---
 package/Makefile.in                                        |    6 +++---
 package/{pkg-autotargets.mk => pkg-autotools.mk}           |    0
 package/{pkg-cmaketargets.mk => pkg-cmake.mk}              |    0
 package/{pkg-gentargets.mk => pkg-generic.mk}              |    0
 9 files changed, 18 insertions(+), 18 deletions(-)
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e1502ebc

docs/manual/adding-packages-autotargets.txt→docs/manual/adding-packages-autotools.txt

+2 −2
Original line number Diff line number Diff line 
Infrastructure for autotools-based packages

-------------------------------------------



[[autotargets-tutorial]]

[[autotools-package-tutorial]]



+autotools-package+ tutorial

~~~~~~~~~~~~~~~~~~~~~~
@@ -61,7 +61,7 @@ Finally, on line line 14, we invoke the +autotools-package+ 
macro that generates all the Makefile rules that actually allows the

package to be built.



[[autotargets-reference]]

[[autotools-package-reference]]



+autotools-package+ reference

~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-cmaketargets.txt→docs/manual/adding-packages-cmake.txt

+2 −2
Original line number Diff line number Diff line 
Infrastructure for CMake-based packages

---------------------------------------



[[cmaketargets-tutorial]]

[[cmake-package-tutorial]]



+cmake-package+ tutorial

~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,7 +60,7 @@ Finally, on line line 14, we invoke the +cmake-package+ 
macro that generates all the Makefile rules that actually allows the

package to be built.



[[cmaketargets-reference]]

[[cmake-package-reference]]



+cmake-package+ reference

~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-directory.txt

+6 −6
Original line number Diff line number Diff line
@@ -163,22 +163,22 @@ different way, using different infrastructures: 
  infrastructure must be used for all packages that do not use the

  autotools as their build system. In the future, other specialized

  infrastructures might be written for other build systems.  We cover

  them through in a xref:gentargets-tutorial[tutorial] and a

  xref:gentargets-reference[reference].

  them through in a xref:generic-package-tutorial[tutorial] and a

  xref:generic-package-reference[reference].



* *Makefiles for autotools-based software* (autoconf, automake, etc.):

  We provide a dedicated infrastructure for such packages, since

  autotools is a very common build system. This infrastructure 'must'

  be used for new packages that rely on the autotools as their build

  system. We cover them through a xref:autotargets-tutorial[tutorial]

  and xref:autotargets-reference[reference].

  system. We cover them through a xref:autotools-package-tutorial[tutorial]

  and xref:autotools-package-reference[reference].



* *Makefiles for cmake-based software*: We provide a dedicated

   infrastructure for such packages, as CMake is a more and more

   commonly used build system and has a standardized behaviour. This

   infrastructure 'must' be used for new packages that rely on

   CMake. We cover them through a xref:cmaketargets-tutorial[tutorial]

   and xref:cmaketargets-reference[reference].

   CMake. We cover them through a xref:cmake-package-tutorial[tutorial]

   and xref:cmake-package-reference[reference].



* *Hand-written Makefiles:* These are currently obsolete, and no new

  manual Makefiles should be added. However, since there are still

docs/manual/adding-packages-gentargets.txt→docs/manual/adding-packages-generic.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ whose build system is not one of the standard ones, such as 
'autotools' or 'CMake'. This typically includes packages whose build

system is based on hand-written Makefiles or shell scripts.



[[gentargets-tutorial]]

[[generic-package-tutorial]]



+generic-package+ Tutorial

~~~~~~~~~~~~~~~~~~~~~
@@ -87,7 +87,7 @@ Finally, on line 35, we call the +generic-package+ which 
generates, according to the variables defined previously, all the

Makefile code necessary to make your package working.



[[gentargets-reference]]

[[generic-package-reference]]



+generic-package+ Reference

~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages.txt

+3 −3
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ tuning their configuration. 


include::adding-packages-directory.txt[]



include::adding-packages-gentargets.txt[]

include::adding-packages-generic.txt[]



include::adding-packages-autotargets.txt[]

include::adding-packages-autotools.txt[]



include::adding-packages-cmaketargets.txt[]

include::adding-packages-cmake.txt[]



include::adding-packages-handwritten.txt[]