From f162c5f5f9f96ce81092d14a01b2f965fe67259a Mon Sep 17 00:00:00 2001 From: Scott Wheeler Date: Sun, 24 Sep 2006 18:10:30 +0000 Subject: [PATCH] And now get everything building again... git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@588037 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- AUTHORS | 11 + COPYING | 481 ++++++++++++++++++++++++ INSTALL | 167 ++++++++ Makefile.cvs | 14 + bindings/c/Makefile.am | 4 +- bindings/c/configure.in.in | 2 +- configure.in.in | 108 +++++- examples/Makefile.am | 4 +- taglib/Makefile.am | 35 -- taglib/ape/Makefile.am | 2 - taglib/flac/Makefile.am | 2 - taglib/mpc/Makefile.am | 2 - taglib/mpeg/Makefile.am | 2 - taglib/mpeg/id3v1/Makefile.am | 2 - taglib/mpeg/id3v2/Makefile.am | 2 - taglib/mpeg/id3v2/frames/Makefile.am | 2 - taglib/mpeg/id3v2/id3v2frame.cpp | 2 +- taglib/mpeg/id3v2/id3v2framefactory.cpp | 2 +- taglib/ogg/Makefile.am | 2 - taglib/ogg/flac/Makefile.am | 2 - taglib/ogg/vorbis/Makefile.am | 2 - taglib/toolkit/Makefile.am | 2 - tests/Makefile.am | 2 +- 23 files changed, 782 insertions(+), 72 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 INSTALL create mode 100644 Makefile.cvs diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..8872bd80 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,11 @@ +Scott Wheeler + Author, maintainer +Ismael Orenstein + Xing header implementation +Allan Sandfeld Jensen + FLAC metadata implementation +Teemu Tervo + Numerous bug reports and fixes + +Please send all patches and questions to taglib-devel@kde.org rather than to +individual developers! diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..e38ffa83 --- /dev/null +++ b/COPYING @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/INSTALL b/INSTALL new file mode 100644 index 00000000..02a4a074 --- /dev/null +++ b/INSTALL @@ -0,0 +1,167 @@ +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, a file +`config.cache' that saves the results of its tests to speed up +reconfiguring, and a file `config.log' containing compiler output +(useful mainly for debugging `configure'). + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If at some point `config.cache' +contains results you don't want to keep, you may remove or edit it. + + The file `configure.in' is used to create `configure' by a program +called `autoconf'. You only need `configure.in' if you want to change +it or regenerate `configure' using a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes a while. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Type `make install' to install the programs and any data files and + documentation. + + 4. You can remove the program binaries and object files from the + source code directory by typing `make clean'. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. You can give `configure' +initial values for variables by setting them in the environment. Using +a Bourne-compatible shell, you can do that on the command line like +this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure + +Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile the package for one architecture at a time +in the source code directory. After you have installed the package for +one architecture, use `make distclean' before reconfiguring for another +architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' can not figure out +automatically, but needs to determine by the type of host the package +will run on. Usually `configure' can figure that out, but if it prints +a message saying it can not guess the host type, give it the +`--host=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name with three fields: + CPU-COMPANY-SYSTEM + +See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the host type. + + If you are building compiler tools for cross-compiling, you can also +use the `--target=TYPE' option to select the type of system they will +produce code for and the `--build=TYPE' option to select the type of +system on which you are compiling the package. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Operation Controls +================== + + `configure' recognizes the following options to control how it +operates. + +`--cache-file=FILE' + Use and save the results of the tests in FILE instead of + `./config.cache'. Set FILE to `/dev/null' to disable caching, for + debugging `configure'. + +`--help' + Print a summary of the options to `configure', and exit. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--version' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`configure' also accepts some other, not widely useful, options. + diff --git a/Makefile.cvs b/Makefile.cvs new file mode 100644 index 00000000..ac8066e0 --- /dev/null +++ b/Makefile.cvs @@ -0,0 +1,14 @@ +all: + @echo "This Makefile is only for the CVS repository" + @echo "This will be deleted before making the distribution" + @echo "" + @if test ! -d admin; then \ + echo "Please recheckout this module!" ;\ + echo "for cvs: use checkout once and after that update again" ;\ + echo "for cvsup: checkout kde-common from cvsup and" ;\ + echo " link kde-common/admin to ./admin" ;\ + exit 1 ;\ + fi + $(MAKE) -f admin/Makefile.common cvs + +.SILENT: diff --git a/bindings/c/Makefile.am b/bindings/c/Makefile.am index ad6591f2..c1eaaf83 100644 --- a/bindings/c/Makefile.am +++ b/bindings/c/Makefile.am @@ -17,9 +17,7 @@ taglib_include_HEADERS = tag_c.h taglib_includedir = $(includedir)/taglib libtag_c_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0 -libtag_c_la_LIBADD = ../../libtag.la +libtag_c_la_LIBADD = ../../taglib/libtag.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = taglib_c.pc - -EXTRA_DIST = $(libtag_c_la_SOURCES) $(taglib_include_HEADERS) diff --git a/bindings/c/configure.in.in b/bindings/c/configure.in.in index 5d84f17c..3e847407 100644 --- a/bindings/c/configure.in.in +++ b/bindings/c/configure.in.in @@ -1 +1 @@ -dnl AC_OUTPUT(taglib/bindings/c/taglib_c.pc) +dnl AC_OUTPUT(bindings/c/taglib_c.pc) diff --git a/configure.in.in b/configure.in.in index 5e9bf287..d449eacc 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,18 +1,114 @@ +dnl This file is part of the KDE libraries/packages +dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org) +dnl modified by Walter Tasin (tasin@kdevelop.org) +dnl for c++ console applications + +dnl This file is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Library General Public +dnl License as published by the Free Software Foundation; either +dnl version 2 of the License, or (at your option) any later version. + +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Library General Public License for more details. + +dnl You should have received a copy of the GNU Library General Public License +dnl along with this library; see the file COPYING.LIB. If not, write to +dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +dnl Boston, MA 02111-1307, USA. + +# Original Author was Kalle@kde.org +# I lifted it in some mater. (Stephan Kulow) +# I used much code from Janos Farkas + +dnl Process this file with autoconf to produce a configure script. + +AC_INIT(acinclude.m4) dnl a source file from your sub dir + +dnl This is so we can use kde-common +AC_CONFIG_AUX_DIR(admin) + +dnl This ksh/zsh feature conflicts with `cd blah ; pwd` +unset CDPATH + +dnl Checking host/target/build systems, for make, install etc. +AC_CANONICAL_SYSTEM +dnl Perform program name transformation +AC_ARG_PROGRAM + +dnl Automake doc recommends to do this only here. (Janos) +AM_INIT_AUTOMAKE(taglib,1.4) + +dnl almost the same like KDE_SET_PEFIX but the path is /usr/local +dnl +unset CDPATH +dnl make /usr/local the default for the installation +AC_PREFIX_DEFAULT(/usr/local) + +if test "x$prefix" = "xNONE"; then + prefix=$ac_default_prefix + ac_configure_args="$ac_configure_args --prefix $prefix" +fi +KDE_FAST_CONFIGURE +KDE_CONF_FILES + +dnl without this order in this file, automake will be confused! +dnl +AM_CONFIG_HEADER(config.h) + +dnl checks for programs. +dnl first check for c/c++ compilers +AC_CHECK_COMPILERS + +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ + +dnl create only shared libtool-libraries +AC_ENABLE_SHARED(yes) + +dnl set the following to yes, if you want to create static +dnl libtool-libraries, too. +AC_ENABLE_STATIC(no) + +dnl create a working libtool-script +KDE_PROG_LIBTOOL + +dnl activate the next macro call for DLOPEN tests and setting LIBDL +dnl (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one) +dnl KDE_CHECK_DLOPEN + +dnl activate the next macro call for some additional tests +dnl (compat, crypt, socket, nsl, dlopen, ...) +dnl KDE_MISC_TESTS dnl __kdevelop__ + +dnl KDE_NEED_FLEX dnl __kdevelop__ +dnl AC_PROG_YACC dnl __kdevelop__ + +dnl KDE_CHECK_EXTRA_LIBS +all_libraries="$all_libraries $USER_LDFLAGS" +all_includes="$all_includes $USER_INCLUDES" +AC_SUBST(all_includes) +AC_SUBST(all_libraries) + +AC_SUBST(AUTODIRS) + #AM_INIT_AUTOMAKE(taglib,1.0) dnl don't remove the below -dnl AC_OUTPUT(taglib/taglib-config) -dnl AC_OUTPUT(taglib/taglib.pc) +dnl AC_OUTPUT(taglib-config) +dnl AC_OUTPUT(taglib.pc) AC_DEFUN([AC_HAVE_ZLIB], [ - AC_DEFINE(HAVE_ZLIB, 1, [have zlib]) - have_zlib=true + AC_DEFINE(HAVE_ZLIB, 1, [have zlib]) + have_zlib=true ]) AC_DEFUN([AC_NO_ZLIB], [ - AC_DEFINE(HAVE_ZLIB, 0, [have zlib]) - have_zlib=false + AC_DEFINE(HAVE_ZLIB, 0, [have zlib]) + have_zlib=false ]) AC_CHECK_HEADER(zlib.h, AC_HAVE_ZLIB, AC_NO_ZLIB) diff --git a/examples/Makefile.am b/examples/Makefile.am index 71665b99..c00f4870 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = \ -I$(top_srcdir)/taglib/mpeg \ -I$(top_srcdir)/taglib/mpeg/id3v1 \ -I$(top_srcdir)/taglib/mpeg/id3v2 \ - -I$(top_srcdir)/taglib/bindings/c + -I$(top_srcdir)/bindings/c -LDADD = ../libtag.la +LDADD = ../taglib/libtag.la tagreader_c_LDADD = ../bindings/c/libtag_c.la diff --git a/taglib/Makefile.am b/taglib/Makefile.am index f54ce7b2..38ac8aa4 100644 --- a/taglib/Makefile.am +++ b/taglib/Makefile.am @@ -17,38 +17,3 @@ taglib_includedir = $(includedir)/taglib libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 5:0:4 libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la ./mpc/libmpc.la ./ape/libape.la ./toolkit/libtoolkit.la - -bin_SCRIPTS = taglib-config - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = taglib.pc - -EXTRA_DIST = $(libtag_la_SOURCES) $(taglib_include_HEADERS) $(pkgconfig_DATA) - -examples: examples-all - -examples-all: - cd examples ; \ - $(MAKE) all - -apidox: - $(mkinstalldirs) doc/api; \ - if test ! -x doc/common; then \ - $(LN_S) $(kde_libs_htmldir)/en/common doc/common ; \ - fi; \ - cp $(top_srcdir)/admin/Doxyfile.global taglib.doxyfile; \ - echo "PROJECT_NAME = TagLib" >> taglib.doxyfile; \ - echo "PROJECT_NUMBER = \"Version 1.1\"" >> taglib.doxyfile; \ - echo "INPUT = $(srcdir)" >> taglib.doxyfile; \ - echo "OUTPUT_DIRECTORY = doc/api" >> taglib.doxyfile; \ - echo "HTML_OUTPUT = html" >> taglib.doxyfile; \ - echo "GENERATE_HTML = YES" >> taglib.doxyfile ; \ - echo "GENERATE_MAN = NO" >> taglib.doxyfile ; \ - echo "GENERATE_LATEX = NO" >> taglib.doxyfile ; \ - echo "HTML_HEADER = doc/common/header.html" >> taglib.doxyfile ; \ - echo "HTML_FOOTER = doc/common/footer.html" >> taglib.doxyfile ; \ - echo "HTML_STYLESHEET = doc/common/doxygen.css" >> taglib.doxyfile ; \ - echo "FILE_PATTERNS = *.h" >> taglib.doxyfile ; \ - echo "PREDEFINED = DO_NOT_DOCUMENT DOXYGEN" >> taglib.doxyfile ; \ - echo "EXTRACT_ALL = YES" >> taglib.doxyfile ; \ - doxygen taglib.doxyfile diff --git a/taglib/ape/Makefile.am b/taglib/ape/Makefile.am index 6d0635a7..14999386 100644 --- a/taglib/ape/Makefile.am +++ b/taglib/ape/Makefile.am @@ -9,5 +9,3 @@ libape_la_SOURCES = apetag.cpp apefooter.cpp apeitem.cpp taglib_include_HEADERS = apetag.h apefooter.h apeitem.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libape_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/flac/Makefile.am b/taglib/flac/Makefile.am index 40caf2ea..337986a8 100644 --- a/taglib/flac/Makefile.am +++ b/taglib/flac/Makefile.am @@ -12,5 +12,3 @@ libflac_la_SOURCES = flacfile.cpp flacproperties.cpp taglib_include_HEADERS = flacfile.h flacproperties.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libflac_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/mpc/Makefile.am b/taglib/mpc/Makefile.am index 4d12cb66..69247562 100644 --- a/taglib/mpc/Makefile.am +++ b/taglib/mpc/Makefile.am @@ -12,5 +12,3 @@ libmpc_la_SOURCES = mpcfile.cpp mpcproperties.cpp taglib_include_HEADERS = mpcfile.h mpcproperties.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libmpc_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/mpeg/Makefile.am b/taglib/mpeg/Makefile.am index acc3614e..b189c30c 100644 --- a/taglib/mpeg/Makefile.am +++ b/taglib/mpeg/Makefile.am @@ -15,5 +15,3 @@ taglib_include_HEADERS = mpegfile.h mpegproperties.h mpegheader.h xingheader.h taglib_includedir = $(includedir)/taglib libmpeg_la_LIBADD = ./id3v2/libid3v2.la ./id3v1/libid3v1.la - -EXTRA_DIST = $(libmpeg_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/mpeg/id3v1/Makefile.am b/taglib/mpeg/id3v1/Makefile.am index ae0b590a..86144684 100644 --- a/taglib/mpeg/id3v1/Makefile.am +++ b/taglib/mpeg/id3v1/Makefile.am @@ -10,5 +10,3 @@ libid3v1_la_SOURCES = id3v1tag.cpp id3v1genres.cpp taglib_include_HEADERS = id3v1tag.h id3v1genres.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libid3v1_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/mpeg/id3v2/Makefile.am b/taglib/mpeg/id3v2/Makefile.am index a58c83e9..1a45ae50 100644 --- a/taglib/mpeg/id3v2/Makefile.am +++ b/taglib/mpeg/id3v2/Makefile.am @@ -24,5 +24,3 @@ zlib = -lz endif libid3v2_la_LIBADD = ./frames/libframes.la $(zlib) - -EXTRA_DIST = $(libid3v2_la_SOURCES) $(taglib_include_HEADERS) id3v2.4.0-frames.txt id3v2.4.0-structure.txt diff --git a/taglib/mpeg/id3v2/frames/Makefile.am b/taglib/mpeg/id3v2/frames/Makefile.am index 78474b5c..8026a233 100644 --- a/taglib/mpeg/id3v2/frames/Makefile.am +++ b/taglib/mpeg/id3v2/frames/Makefile.am @@ -25,5 +25,3 @@ taglib_include_HEADERS = \ unknownframe.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libframes_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index 9b5827c5..fc090fef 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -19,7 +19,7 @@ * USA * ***************************************************************************/ -#include +#include #include diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index aebf8417..91e365fd 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -19,7 +19,7 @@ * USA * ***************************************************************************/ -#include +#include #include diff --git a/taglib/ogg/Makefile.am b/taglib/ogg/Makefile.am index d80e5e4f..b8022382 100644 --- a/taglib/ogg/Makefile.am +++ b/taglib/ogg/Makefile.am @@ -19,5 +19,3 @@ taglib_include_HEADERS = \ taglib_includedir = $(includedir)/taglib libogg_la_LIBADD = ./vorbis/libvorbis.la ./flac/liboggflac.la - -EXTRA_DIST = $(libogg_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/ogg/flac/Makefile.am b/taglib/ogg/flac/Makefile.am index 83c08539..120aa2a4 100644 --- a/taglib/ogg/flac/Makefile.am +++ b/taglib/ogg/flac/Makefile.am @@ -11,5 +11,3 @@ liboggflac_la_SOURCES = oggflacfile.cpp taglib_include_HEADERS = oggflacfile.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(liboggflac_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/ogg/vorbis/Makefile.am b/taglib/ogg/vorbis/Makefile.am index 4a6393c1..c7880fb1 100644 --- a/taglib/ogg/vorbis/Makefile.am +++ b/taglib/ogg/vorbis/Makefile.am @@ -10,5 +10,3 @@ libvorbis_la_SOURCES = vorbisfile.cpp vorbisproperties.cpp taglib_include_HEADERS = vorbisfile.h vorbisproperties.h taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libvorbis_la_SOURCES) $(taglib_include_HEADERS) diff --git a/taglib/toolkit/Makefile.am b/taglib/toolkit/Makefile.am index 7e9ea14c..7dcd3860 100644 --- a/taglib/toolkit/Makefile.am +++ b/taglib/toolkit/Makefile.am @@ -12,5 +12,3 @@ taglib_include_HEADERS = \ tmap.h tmap.tcc taglib_includedir = $(includedir)/taglib - -EXTRA_DIST = $(libtoolkit_la_SOURCES) $(taglib_include_HEADERS) diff --git a/tests/Makefile.am b/tests/Makefile.am index a66e0acd..b8f68743 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = \ -I$(top_srcdir)/taglib/toolkit \ -I$(top_srcdir)/taglib/mpeg/id3v2 -LDADD = ../libtag.la +LDADD = ../taglib/libtag.la check_PROGRAMS = toolkit-test -- 2.40.0