Changeset 13e0a61 for general/graphlib


Ignore:
Timestamp:
06/01/2013 08:03:58 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
af73a280
Parents:
dcdde93
Message:

Merge trunk and systemd branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11231 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general/graphlib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general/graphlib/giflib.xml

    rdcdde93 r13e0a61  
    8888    commands:</para>
    8989
    90 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     90<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
    9191make</userinput></screen>
    9292
    … …  
    107107    <title>Command Explanations</title>
    108108
    109     <para><option>--disable-static</option>: This switch prevents the
    110     static library from being built.</para>
     109    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     110      href="../../xincludes/static-libraries.xml"/>
    111111
    112112  </sect2>
    … …  
    125125        gifinfo, gifinter, gifinto, gifovly, gifpos, gifrotat, gifrsize, gifspnge,
    126126        giftext, gifwedge, icon2gif, raw2gif, rgb2gif, and text2gif</seg>
    127         <seg>libgif.{so,a}</seg>
     127        <seg>libgif.so</seg>
    128128        <seg>/usr/share/doc/giflib-&giflib-version;</seg>
    129129      </seglistitem>
    … …  
    438438
    439439      <varlistentry id="libgif">
    440         <term><filename class='libraryfile'>libgif.{so,a}</filename></term>
     440        <term><filename class='libraryfile'>libgif.so</filename></term>
    441441        <listitem>
    442442          <para>contains API functions required by the
    … …  
    444444          library functionality to read, write and manipulate GIF images.</para>
    445445          <indexterm zone="giflib libgif">
    446             <primary sortas="c-libgif">libgif.{so,a}</primary>
     446            <primary sortas="c-libgif">libgif.so</primary>
    447447          </indexterm>
    448448        </listitem>

  • general/graphlib/imlib2.xml

    rdcdde93 r13e0a61  
    8383    following commands:</para>
    8484
    85 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     85<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
    8686make</userinput></screen>
    8787
    … …  
    9999  <sect2 role="commands">
    100100    <title>Command Explanations</title>
     101
     102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     103      href="../../xincludes/static-libraries.xml"/>
    101104
    102105    <para><parameter>--without-x</parameter>: Add this parameter if you do not
    … …  
    116119        <seg>imlib2_bumpmap, imlib2_colorspace, imlib2-config, imlib2_conv,
    117120        imlib2_grab, imlib2_poly, imlib2_show, imlib2_test, and imlib2_view</seg>
    118         <seg>libImlib2.{so,a} and various filters and image loader modules.</seg>
     121        <seg>libImlib2.so and various filters and image loader modules.</seg>
    119122        <seg>/usr/lib/imlib2, /usr/share/doc/imlib2-&imlib2-version;, and
    120123        /usr/share/imlib2</seg>
    … …  
    128131
    129132      <varlistentry id="libImlib2">
    130         <term><filename class='libraryfile'>libImlib2.{so,a}</filename></term>
     133        <term><filename class='libraryfile'>libImlib2.so</filename></term>
    131134        <listitem>
    132135          <para>provides the functions for programs to deal with various
    133136          image data formats.</para>
    134137          <indexterm zone="imlib2 libImlib2">
    135             <primary sortas="c-libImlib2">libImlib2.{so,a}</primary>
     138            <primary sortas="c-libImlib2">libImlib2.so</primary>
    136139          </indexterm>
    137140        </listitem>

  • general/graphlib/lcms.xml

    rdcdde93 r13e0a61  
    8787    following commands:</para>
    8888
    89 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     89<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
    9090make</userinput></screen>
    9191
    … …  
    104104    <title>Command Explanations</title>
    105105
     106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     107      href="../../xincludes/static-libraries.xml"/>
     108
    106109    <para><option>--with-python</option>: Use this parameter if
    107110    <application>Python</application> and
    108111    <application>SWIG</application> are installed.</para>
    109 
    110     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111       href="../../xincludes/static-libraries.xml"/>
    112112
    113113  </sect2>
    … …  
    124124        <seg>icc2ps, icclink, icctrans, wtpt and
    125125        optionally, jpegicc, tiffdiff and tifficc</seg>
    126         <seg>liblcms.{so,a} and the optional _lcms.{so,a} Python module</seg>
     126        <seg>liblcms.so and the optional _lcms.so Python module</seg>
    127127        <seg>/usr/share/doc/lcms-&lcms-version;</seg>
    128128      </seglistitem>
    … …  
    205205
    206206      <varlistentry id="liblcms">
    207         <term><filename class='libraryfile'>liblcms.{so,a}</filename></term>
     207        <term><filename class='libraryfile'>liblcms.so</filename></term>
    208208        <listitem>
    209209          <para>is used by the <application>lcms</application> programs as
    210210          well as other programs to provide color management facilities.</para>
    211211          <indexterm zone="lcms liblcms">
    212             <primary sortas="c-liblcms">liblcms.{so,a}</primary>
     212            <primary sortas="c-liblcms">liblcms.so</primary>
    213213          </indexterm>
    214214        </listitem>

  • general/graphlib/libmng.xml

    rdcdde93 r13e0a61  
    8383    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    8484
    85 <screen role="root"><userinput>make prefix=/usr install &amp;&amp;
     85<screen role="root"><userinput>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//' Makefile &amp;&amp;
     86make prefix=/usr install &amp;&amp;
    8687install -v -m644 doc/man/*.3 /usr/share/man/man3 &amp;&amp;
    8788install -v -m644 doc/man/*.5 /usr/share/man/man5 &amp;&amp;
    … …  
    101102    Add a gcc option to make the build compatible with x86_64 systems.</para>
    102103
     104    <para><command>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//' Makefile</command>
     105    This command disables installing the static library.</para>
     106
    103107    <para><command>install ...</command>: The documentation files are not
    104108    installed by the installation procedure, so they are copied manually.</para>
    … …  
    116120      <seglistitem>
    117121        <seg>None</seg>
    118         <seg>libmng.{so,a}</seg>
     122        <seg>libmng.so</seg>
    119123        <seg>/usr/share/doc/libmng-&libmng-version;</seg>
    120124      </seglistitem>
    … …  
    127131
    128132      <varlistentry id="libmng-lib">
    129         <term><filename class='libraryfile'>libmng.{so,a}</filename></term>
     133        <term><filename class='libraryfile'>libmng.so</filename></term>
    130134        <listitem>
    131135          <para>provides functions for programs wishing to read and write
    … …  
    133137          with certain other formats.</para>
    134138          <indexterm zone="libmng libmng-lib">
    135             <primary sortas="c-libmng">libmng.{so,a}</primary>
     139            <primary sortas="c-libmng">libmng.so</primary>
    136140          </indexterm>
    137141        </listitem>
Note: See TracChangeset for help on using the changeset viewer.