Drop imlib2-config (use pkg-config)

This commit is contained in:
Kim Woelders 2008-10-22 18:36:39 +00:00
parent 7808f34750
commit e9d84bd216
7 changed files with 3 additions and 70 deletions

1
.gitignore vendored
View File

@ -17,7 +17,6 @@
/stamp-h1
/m4/*.m4
/imlib2-config
/imlib2.pc
/imlib2.spec
/README

View File

@ -11,8 +11,6 @@ MAINTAINERCLEANFILES = aclocal.m4 compile \
depcomp install-sh ltmain.sh missing Makefile.in \
imlib2_docs.tar.gz
bin_SCRIPTS = imlib2-config
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
Doxyfile \
README.in README \

View File

@ -407,12 +407,8 @@ data/Makefile
data/fonts/Makefile
data/images/Makefile
doc/Makefile
imlib2-config
README
])
AC_CONFIG_COMMANDS([default],[
chmod +x imlib2-config
],[])
AC_OUTPUT
#####################################################################

View File

@ -216,7 +216,7 @@ int main(int argc, char **argv)
}</font></tt></pre>
Now to compile this
<br>
<tt><font color="#000099">cc imlib2_convert.c -o imlib2_convert `imlib2-config --cflags` `imlib2-config --libs`</font></tt>
<tt><font color="#000099">cc imlib2_convert.c -o imlib2_convert `pkg-config --cflags --libs imlib2`</font></tt>
<br>
You now have a program that if used as follows:
<br>

View File

@ -1,59 +0,0 @@
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
usage="\
Usage: imlib2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
if test $# -eq 0; then
echo "${usage}" 1>&2
exit 1
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo $prefix
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo $exec_prefix
;;
--version)
echo @VERSION@
;;
--cflags)
if test @prefix@/include != /usr/include ; then
includes="-I@prefix@/include"
fi
echo $includes
;;
--libs)
libdirs=-L@libdir@
echo $libdirs -lImlib2
;;
*)
echo "${usage}" 1>&2
exit 1
;;
esac
shift
done
exit 0

View File

@ -91,7 +91,7 @@ int main(int argc, char **argv)
Now to compile this
@verbatim
cc imlib2_convert.c -o imlib2_convert `imlib2-config --cflags` `imlib2-config --libs`
cc imlib2_convert.c -o imlib2_convert `pkg-config --cflags --libs imlib2`
@endverbatim
You now have a program that if used as follows:
@ -544,4 +544,4 @@ return type - Imlib_Image, this is the result of filter.
@todo filled polygons can break fill bounds on corner cases - fix
@todo go thru TODOs and FIXMEs
*/
*/

View File

@ -43,7 +43,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/libImlib2.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/filters/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/loaders/*.la
rm -f $RPM_BUILD_ROOT%{_bindir}/imlib2-config
%clean
rm -rf $RPM_BUILD_ROOT