fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-08 22:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[trace] Install cairo-trace.so into $(libdir)/cairo

Browse source 
Install the auxiliary library into the cairo subdirectory within the
lib path, so that it doesn't clutter $(libdir) and sets a precedent for
future auxiliary libraries.
This commit is contained in:
Chris Wilson 2008-11-03 23:23:09 +00:00
parent c80a1c68c1
commit 4f032ca35a
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
util/cairo-trace/Makefile.am
View file

@ -1,5 +1,6 @@
bin_SCRIPTS = cairo-trace
lib_LTLIBRARIES = cairo-trace.la
cairolibdir = @libdir@/cairo
cairolib_LTLIBRARIES = cairo-trace.la
AM_CPPFLAGS = -I$(top_srcdir)/src \
-I$(top_builddir)/src
@ -13,10 +14,10 @@ cairo_trace_la_LDFLAGS = -module -no-undefined
cairo_trace_la_LIBADD = -ldl -lz $(BFD_LIBS)
system-install:
grep -sq @libdir@/cairo-trace.so /etc/ld.so.preload || echo @libdir@/cairo-trace.so >> /etc/ld.so.preload
grep -sq @cairolibdir@/cairo-trace.so /etc/ld.so.preload || echo @libdir@/cairo-trace.so >> /etc/ld.so.preload
system-uninstall:
sed -e '@libdir@\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
sed -e '@cairolibdir@\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
EXTRA_DIST = \
COPYING \

13
util/cairo-trace/cairo-trace.in
View file

@ -49,10 +49,17 @@ if test -z "$nofile"; then
filename=`basename $1`.$$.trace
fi
LD_PRELOAD=@libdir@/cairo/cairo-trace.so
export LD_PRELOAD
# Force the decimal output to the 'C' locale
LC_ALL=C
export LC_ALL
if test -z "$filename"; then
LD_PRELOAD=@libdir@/cairo-trace.so CAIRO_TRACE_FD=3 LC_ALL=C $* 3>&1 >/dev/null
CAIRO_TRACE_FD=3 $* 3>&1 >/dev/null
elif test -n "$silent"; then
LD_PRELOAD=@libdir@/cairo-trace.so LC_ALL=C CAIRO_TRACE_OUTFILE_EXACT=$filename $*
CAIRO_TRACE_OUTFILE_EXACT=$filename $*
else
LD_PRELOAD=@libdir@/cairo-trace.so CAIRO_TRACE_FD=3 LC_ALL=C $* 3>&1 >/dev/null | tee $filename
CAIRO_TRACE_FD=3 $* 3>&1 >/dev/null | tee $filename
fi