Commit 49470ebd authored by gengyue's avatar gengyue
Browse files

change library name from libcairo to libhicairo

parent 42caea03
Pipeline #383 failed with stage
......@@ -20,7 +20,7 @@ information, (in the opening comment of each file).
directory of the cairo source distribution. There are other components
of the cairo source distribution (such as the "test", "util", and "perf")
that are auxiliary to the library itself. None of the source code in these
directories contributes to a build of the cairo library itself, (libcairo.so
directories contributes to a build of the cairo library itself, (libhicairo.so
or cairo.dll or similar).
These auxiliary components are also free software, but may be under
......
......@@ -15,47 +15,47 @@ AM_CPPFLAGS = \
AM_LDFLAGS = $(CAIRO_LDFLAGS)
if BUILD_CXX
cxx_boilerplate_lib = libcairoboilerplate_cxx.la
cxx_boilerplate_lib = libhicairoboilerplate_cxx.la
else
cxx_boilerplate_lib =
endif
EXTRA_LTLIBRARIES += libcairoboilerplate.la $(cxx_boilerplate_lib)
EXTRA_LTLIBRARIES += libhicairoboilerplate.la $(cxx_boilerplate_lib)
libcairoboilerplate_la_SOURCES = \
libhicairoboilerplate_la_SOURCES = \
$(enabled_cairo_boilerplate_headers) \
$(enabled_cairo_boilerplate_private) \
$(enabled_cairo_boilerplate_sources) \
cairo-boilerplate-constructors.c \
$(NULL)
libcairoboilerplate_cxx_la_SOURCES = \
libhicairoboilerplate_cxx_la_SOURCES = \
$(enabled_cairo_boilerplate_cxx_sources) \
$(NULL)
libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la \
libhicairoboilerplate_la_LIBADD = $(top_builddir)/src/libhicairo.la \
$(cxx_boilerplate_lib) \
$(CAIRO_LIBS) \
$(CAIROBOILERPLATE_LIBS) \
$(NULL)
libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \
libhicairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libhicairo.la \
$(CAIRO_LIBS) \
$(CAIROBOILERPLATE_LIBS) \
$(NULL)
libcairoboilerplate_la_DEPENDENCIES = \
libhicairoboilerplate_la_DEPENDENCIES = \
$(cxx_boilerplate_lib) \
$(NULL)
if CAIRO_HAS_DL
libcairoboilerplate_la_LIBADD += -ldl
libhicairoboilerplate_la_LIBADD += -ldl
endif
if CAIRO_HAS_BEOS_SURFACE
# BeOS system headers trigger this warning
libcairoboilerplate_cxx_la_CXXFLAGS = -Wno-multichar
libhicairoboilerplate_cxx_la_CXXFLAGS = -Wno-multichar
endif
if CAIRO_HAS_WIN32_SURFACE
libcairoboilerplate_la_LIBADD += -lwinspool
libhicairoboilerplate_la_LIBADD += -lwinspool
endif
cairo-boilerplate-constructors.c: Makefile $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources) make-cairo-boilerplate-constructors.sh
......@@ -73,4 +73,4 @@ TESTS += check-link$(EXEEXT)
endif
check_PROGRAMS += check-link
check_link_LDADD = libcairoboilerplate.la
check_link_LDADD = libhicairoboilerplate.la
......@@ -32,48 +32,48 @@ EXTRA_PROGRAMS += \
cairo-perf-graph-files \
$(NULL)
EXTRA_DIST += cairo-perf-diff COPYING
EXTRA_LTLIBRARIES += libcairoperf.la
EXTRA_LTLIBRARIES += libhicairoperf.la
LDADD = libcairoperf.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la
LDADD = libhicairoperf.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la
cairo_perf_micro_SOURCES = $(cairo_perf_micro_sources)
cairo_perf_micro_LDADD = \
$(top_builddir)/perf/micro/libcairo-perf-micro.la \
$(top_builddir)/perf/micro/libhicairo-perf-micro.la \
$(LDADD)
cairo_perf_micro_DEPENDENCIES = \
$(top_builddir)/perf/micro/libcairo-perf-micro.la \
$(top_builddir)/perf/micro/libhicairo-perf-micro.la \
$(LDADD)
libcairoperf_la_SOURCES = \
$(libcairoperf_sources) \
$(libcairoperf_external_sources) \
$(libcairoperf_headers) \
libhicairoperf_la_SOURCES = \
$(libhicairoperf_sources) \
$(libhicairoperf_external_sources) \
$(libhicairoperf_headers) \
$(NULL)
cairo_analyse_trace_SOURCES = \
$(cairo_analyse_trace_sources) \
$(cairo_analyse_trace_external_sources)
cairo_analyse_trace_LDADD = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(LDADD)
cairo_analyse_trace_DEPENDENCIES = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(LDADD)
cairo_perf_trace_SOURCES = \
$(cairo_perf_trace_sources) \
$(cairo_perf_trace_external_sources)
cairo_perf_trace_LDADD = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(LDADD)
cairo_perf_trace_DEPENDENCIES = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(LDADD)
cairo_perf_diff_files_SOURCES = $(cairo_perf_diff_files_sources)
......@@ -88,17 +88,17 @@ cairo_perf_graph_files_CFLAGS = @gtk_CFLAGS@
cairo_perf_graph_files_LDADD = @gtk_LIBS@ $(LDADD)
# Install rules to rebuild the libraries and add explicit dependencies
$(top_builddir)/perf/micro/libcairo-perf-micro.la:
cd $(top_builddir)/perf/micro && $(MAKE) $(AM_MAKEFLAGS) libcairo-perf-micro.la
$(top_builddir)/perf/micro/libhicairo-perf-micro.la:
cd $(top_builddir)/perf/micro && $(MAKE) $(AM_MAKEFLAGS) libhicairo-perf-micro.la
$(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
$(top_builddir)/boilerplate/libhicairoboilerplate.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libhicairoboilerplate.la
$(top_builddir)/src/libcairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la
$(top_builddir)/src/libhicairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libhicairo.la
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libhicairo-script-interpreter.la
# Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
......
libcairoperf_sources = \
libhicairoperf_sources = \
cairo-perf.c \
cairo-perf-report.c \
cairo-stats.c \
$(NULL)
libcairoperf_external_sources = ../src/cairo-time.c
libhicairoperf_external_sources = ../src/cairo-time.c
libcairoperf_headers = \
libhicairoperf_headers = \
cairo-perf.h \
cairo-stats.h \
$(NULL)
......
......@@ -175,7 +175,7 @@ build() {
done
make || (rm config.cache && make)
(cd boilerplate && make libcairoboilerplate.la)
(cd boilerplate && make libhicairoboilerplate.la)
cd perf
make ${benchmark}
......
......@@ -2,10 +2,10 @@ include $(top_srcdir)/build/Makefile.am.common
include $(top_srcdir)/perf/micro/Makefile.sources
noinst_LTLIBRARIES = libcairo-perf-micro.la
libcairo_perf_micro_la_SOURCES = \
$(libcairo_perf_micro_sources) \
$(libcairo_perf_micro_headers)
noinst_LTLIBRARIES = libhicairo-perf-micro.la
libhicairo_perf_micro_la_SOURCES = \
$(libhicairo_perf_micro_sources) \
$(libhicairo_perf_micro_headers)
AM_CPPFLAGS = \
-I$(srcdir) \
......
libcairo_perf_micro_sources = \
libhicairo_perf_micro_sources = \
cairo-perf-cover.c \
box-outline.c \
composite-checker.c \
......@@ -44,7 +44,7 @@ libcairo_perf_micro_sources = \
fill-clip.c \
$(NULL)
libcairo_perf_micro_headers = \
libhicairo_perf_micro_headers = \
mosaic.h \
world-map.h \
zrusin-another.h \
......
......@@ -20,40 +20,40 @@ $(top_builddir)/config.h: $(top_srcdir)/config.h.in
cairoincludedir = $(includedir)/cairo
cairoinclude_HEADERS = $(enabled_cairo_headers)
lib_LTLIBRARIES = libcairo.la
lib_LTLIBRARIES = libhicairo.la
if BUILD_CXX
cairo_cxx_lib = libcairo_cxx.la
cairo_cxx_lib = libhicairo_cxx.la
else
cairo_cxx_lib =
endif
noinst_LTLIBRARIES = $(cairo_cxx_lib)
libcairo_cxx_la_SOURCES = \
libhicairo_cxx_la_SOURCES = \
$(enabled_cairo_headers) \
$(enabled_cairo_private) \
$(enabled_cairo_cxx_sources) \
$(NULL)
libcairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) $(export_symbols)
libcairo_cxx_la_LIBADD = $(CAIRO_LIBS)
libcairo_cxx_la_DEPENDENCIES = $(cairo_def_dependency)
libhicairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) $(export_symbols)
libhicairo_cxx_la_LIBADD = $(CAIRO_LIBS)
libhicairo_cxx_la_DEPENDENCIES = $(cairo_def_dependency)
libcairo_la_SOURCES = \
libhicairo_la_SOURCES = \
$(enabled_cairo_headers) \
$(enabled_cairo_private) \
$(enabled_cairo_sources) \
$(NULL)
libcairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libcairo_la_LIBADD = $(CAIRO_LIBS) \
libhicairo_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libhicairo_la_LIBADD = $(CAIRO_LIBS) \
$(cairo_cxx_lib)
libcairo_la_DEPENDENCIES = $(cairo_def_dependency) $(cairo_cxx_lib)
libhicairo_la_DEPENDENCIES = $(cairo_def_dependency) $(cairo_cxx_lib)
# Special headers
cairoinclude_HEADERS += $(top_srcdir)/cairo-version.h
libcairo_la_SOURCES += cairo-version.h
libhicairo_la_SOURCES += cairo-version.h
nodist_cairoinclude_HEADERS = cairo-features.h
nodist_libcairo_la_SOURCES = cairo-features.h
nodist_libhicairo_la_SOURCES = cairo-features.h
BUILT_SOURCES += cairo-features.h cairo-supported-features.h
DISTCLEANFILES += cairo-features.h cairo-supported-features.h
cairo-features.h cairo-supported-features.h:
......@@ -72,7 +72,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
$(EGREP) '^cairo_.* \(' | \
sed -e 's/[ ].*//' | \
sort; \
echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
echo LIBRARY libhicairo-$(CAIRO_VERSION_SONUM).dll; \
) >$@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
......@@ -102,7 +102,7 @@ endif
EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c check-doc-syntax.awk
check_PROGRAMS += check-link
check_link_LDADD = libcairo.la
check_link_LDADD = libhicairo.la
check: headers-standalone
......
......@@ -3,6 +3,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
Libs: ${pc_top_builddir}/${pcfiledir}/src/libcairo.la
Libs: ${pc_top_builddir}/${pcfiledir}/src/libhicairo.la
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/src
......@@ -92,13 +92,13 @@ cairo_test_suite_CFLAGS = $(AM_CFLAGS) $(real_pthread_CFLAGS)
cairo_test_suite_LDADD = \
$(real_pthread_LIBS) \
$(top_builddir)/test/pdiff/libpdiff.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD)
cairo_test_suite_DEPENDENCIES = \
$(top_builddir)/test/pdiff/libpdiff.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la
if BUILD_ANY2PPM
cairo_test_suite_DEPENDENCIES += \
any2ppm$(EXEEXT)
......@@ -114,18 +114,18 @@ cairo_test_trace_CFLAGS = $(AM_CFLAGS) $(real_pthread_CFLAGS)
cairo_test_trace_LDADD = \
$(real_pthread_LIBS) \
$(top_builddir)/test/pdiff/libpdiff.la \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(CAIRO_LDADD) \
$(SHM_LIBS)
cairo_test_trace_DEPENDENCIES = \
$(top_builddir)/test/pdiff/libpdiff.la \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la \
$(top_builddir)/util/cairo-missing/libcairo-missing.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la \
$(top_builddir)/util/cairo-missing/libhicairo-missing.la \
$(NULL)
endif
......@@ -213,11 +213,11 @@ AM_CPPFLAGS = \
$(CAIRO_CFLAGS)
AM_LDFLAGS = $(CAIRO_LDFLAGS)
$(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
$(top_builddir)/boilerplate/libhicairoboilerplate.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libhicairoboilerplate.la
$(top_builddir)/src/libcairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la
$(top_builddir)/src/libhicairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libhicairo.la
$(top_builddir)/test/pdiff/libpdiff.la:
cd $(top_builddir)/test/pdiff && $(MAKE) $(AM_MAKEFLAGS) libpdiff.la
......@@ -225,8 +225,8 @@ $(top_builddir)/test/pdiff/libpdiff.la:
$(top_builddir)/test/pdiff/perceptualdiff:
cd $(top_builddir)/test/pdiff && $(MAKE) $(AM_MAKEFLAGS) perceptualdiff
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libhicairo-script-interpreter.la
EXTRA_PROGRAMS += imagediff png-flatten
......@@ -236,10 +236,10 @@ imagediff_SOURCES = \
buffer-diff.h
imagediff_LDADD = \
$(top_builddir)/test/pdiff/libpdiff.la \
$(top_builddir)/src/libcairo.la
$(top_builddir)/src/libhicairo.la
png_flatten_SOURCES = png-flatten.c
png_flatten_LDADD = $(top_builddir)/src/libcairo.la \
png_flatten_LDADD = $(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD)
if BUILD_ANY2PPM
......@@ -248,8 +248,8 @@ any2ppm_CFLAGS = $(AM_CFLAGS) $(POPPLER_CFLAGS) $(LIBRSVG_CFLAGS) $(LIBSPECTRE_C
# add LDADD, so poppler/librsvg uses "our" cairo
any2ppm_LDFLAGS = $(AM_LDFLAGS) $(CAIRO_TEST_UNDEFINED_LDFLAGS)
any2ppm_LDADD = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/src/libcairo.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD) \
$(CAIROBOILERPLATE_LIBS) \
$(POPPLER_LIBS) \
......@@ -262,7 +262,7 @@ check_PROGRAMS += pdf2png
pdf2png_CFLAGS = $(AM_CFLAGS) $(POPPLER_CFLAGS)
# add LDADD, so poppler uses "our" cairo
pdf2png_LDFLAGS = $(AM_LDFLAGS) $(CAIRO_TEST_UNDEFINED_LDFLAGS)
pdf2png_LDADD = $(top_builddir)/src/libcairo.la \
pdf2png_LDADD = $(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD) \
$(POPPLER_LIBS)
endif
......@@ -272,7 +272,7 @@ check_PROGRAMS += svg2png
svg2png_CFLAGS = $(AM_CFLAGS) $(LIBRSVG_CFLAGS)
# add LDADD, so librsvg uses "our" cairo
svg2png_LDFLAGS = $(AM_LDFLAGS) $(CAIRO_TEST_UNDEFINED_LDFLAGS)
svg2png_LDADD = $(top_builddir)/src/libcairo.la \
svg2png_LDADD = $(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD) \
$(LIBRSVG_LIBS)
endif
......@@ -282,7 +282,7 @@ check_PROGRAMS += ps2png
ps2png_CFLAGS = $(AM_CFLAGS) $(LIBSPECTRE_CFLAGS)
# add LDADD, so ps2png uses "our" cairo
ps2png_LDFLAGS = $(AM_LDFLAGS) $(CAIRO_TEST_UNDEFINED_LDFLAGS)
ps2png_LDADD = $(top_builddir)/src/libcairo.la \
ps2png_LDADD = $(top_builddir)/src/libhicairo.la \
$(CAIRO_LDADD) \
$(LIBSPECTRE_LIBS)
endif
......
......@@ -16,4 +16,4 @@ perceptualdiff_SOURCES = \
perceptualdiff.c
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(CAIRO_CFLAGS)
LDADD = libpdiff.la $(top_builddir)/src/libcairo.la
LDADD = libpdiff.la $(top_builddir)/src/libhicairo.la
......@@ -41,33 +41,33 @@ if CAIRO_HAS_INTERPRETER
EXTRA_PROGRAMS += trace-to-xml xml-to-trace
endif
trace_to_xml_LDADD = cairo-script/libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
trace_to_xml_LDADD = cairo-script/libhicairo-script-interpreter.la $(top_builddir)/src/libhicairo.la $(CAIRO_LDADD)
xml_to_trace_LDADD = -lexpat
show_traps_SOURCES = show-traps.c
show_traps_CFLAGS = $(gtk_CFLAGS)
#show_traps_LDADD = $(top_builddir)/src/libcairo.la $(gtk_LIBS)
#show_traps_LDADD = $(top_builddir)/src/libhicairo.la $(gtk_LIBS)
show_traps_LDADD = $(gtk_LIBS)
show_polygon_SOURCES = show-polygon.c
show_polygon_CFLAGS = $(gtk_CFLAGS)
#show_polygon_LDADD = $(top_builddir)/src/libcairo.la $(gtk_LIBS)
#show_polygon_LDADD = $(top_builddir)/src/libhicairo.la $(gtk_LIBS)
show_polygon_LDADD = $(gtk_LIBS)
show_edges_SOURCES = show-edges.c
show_edges_CFLAGS = $(gtk_CFLAGS)
#show_edges_LDADD = $(top_builddir)/src/libcairo.la $(gtk_LIBS)
#show_edges_LDADD = $(top_builddir)/src/libhicairo.la $(gtk_LIBS)
show_edges_LDADD = $(gtk_LIBS)
show_contour_SOURCES = show-contour.c
show_contour_CFLAGS = $(gtk_CFLAGS)
#show_contour_LDADD = $(top_builddir)/src/libcairo.la $(gtk_LIBS)
#show_contour_LDADD = $(top_builddir)/src/libhicairo.la $(gtk_LIBS)
show_contour_LDADD = $(gtk_LIBS)
show_events_SOURCES = show-events.c
show_events_CFLAGS = $(gtk_CFLAGS)
#show_events_LDADD = $(top_builddir)/src/libcairo.la $(gtk_LIBS)
#show_events_LDADD = $(top_builddir)/src/libhicairo.la $(gtk_LIBS)
show_events_LDADD = $(gtk_LIBS)
util: malloc-stats.so backtrace-symbols.so
......@@ -91,7 +91,7 @@ backtrace_symbols_la_LIBADD = -lbfd -liberty
if HAVE_GTK
EXTRA_PROGRAMS += font-view
font_view_CFLAGS = $(gtk_CFLAGS)
font_view_LDADD = ../src/libcairo.la $(gtk_LIBS)
font_view_LDADD = ../src/libhicairo.la $(gtk_LIBS)
endif
EXTRA_DIST += \
......
......@@ -37,7 +37,7 @@ static void *_dlhandle = RTLD_NEXT;
if (name##_real == NULL) { \
name##_real = dlsym (_dlhandle, #name); \
if (name##_real == NULL && _dlhandle == RTLD_NEXT) { \
_dlhandle = dlopen ("libcairo.so", RTLD_LAZY); \
_dlhandle = dlopen ("libhicairo.so", RTLD_LAZY); \
name##_real = dlsym (_dlhandle, #name); \
assert (name##_real != NULL); \
} \
......
lib_LTLIBRARIES = libcairo-gobject.la
lib_LTLIBRARIES = libhicairo-gobject.la
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
cairoincludedir=$(includedir)/cairo
cairoinclude_HEADERS = cairo-gobject.h
libcairo_gobject_la_SOURCES = \
libhicairo_gobject_la_SOURCES = \
cairo-gobject-enums.c \
cairo-gobject-structs.c \
$(NULL)
libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
libhicairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
libhicairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libhicairo_gobject_la_LIBADD = $(top_builddir)/src/libhicairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
......@@ -2,9 +2,9 @@ include $(top_srcdir)/util/cairo-missing/Makefile.sources
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
noinst_LTLIBRARIES = libcairo-missing.la
noinst_LTLIBRARIES = libhicairo-missing.la
libcairo_missing_la_SOURCES = \
$(libcairo_missing_sources) \
$(libcairo_missing_headers) \
libhicairo_missing_la_SOURCES = \
$(libhicairo_missing_sources) \
$(libhicairo_missing_headers) \
$(NULL)
libcairo_missing_sources = \
libhicairo_missing_sources = \
strndup.c \
getline.c \
$(NULL)
libcairo_missing_headers = \
libhicairo_missing_headers = \
cairo-missing.h \
$(NULL)
......@@ -2,32 +2,32 @@ include $(top_srcdir)/util/cairo-script/Makefile.sources
SUBDIRS = examples
lib_LTLIBRARIES = libcairo-script-interpreter.la
lib_LTLIBRARIES = libhicairo-script-interpreter.la
EXTRA_PROGRAMS = csi-replay csi-exec csi-bind
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
cairoincludedir=$(includedir)/cairo
cairoinclude_HEADERS = cairo-script-interpreter.h
libcairo_script_interpreter_la_SOURCES = \
$(libcairo_script_interpreter_sources) \
$(libcairo_script_interpreter_headers) \
libhicairo_script_interpreter_la_SOURCES = \
$(libhicairo_script_interpreter_sources) \
$(libhicairo_script_interpreter_headers) \
$(NULL)
libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz
libhicairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
libhicairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
libhicairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libhicairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz
csi_replay_SOURCES = csi-replay.c
csi_replay_CFLAGS = $(CAIRO_CFLAGS)
csi_replay_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS)
csi_replay_LDADD = libhicairo-script-interpreter.la $(top_builddir)/src/libhicairo.la $(CAIRO_LIBS)
csi_exec_SOURCES = csi-exec.c
csi_exec_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS)
csi_exec_LDADD = libhicairo-script-interpreter.la $(top_builddir)/src/libhicairo.la $(CAIRO_LIBS)
if CAIRO_HAS_SCRIPT_SURFACE
EXTRA_PROGRAMS += csi-trace
csi_trace_SOURCES = csi-trace.c
csi_trace_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS)
csi_trace_LDADD = libhicairo-script-interpreter.la $(top_builddir)/src/libhicairo.la $(CAIRO_LIBS)
endif
EXTRA_DIST = \
......
libcairo_script_interpreter_sources = \
libhicairo_script_interpreter_sources = \
cairo-script-file.c \
cairo-script-hash.c \
cairo-script-interpreter.c \
......@@ -8,6 +8,6 @@ libcairo_script_interpreter_sources = \
cairo-script-stack.c \
$(NULL)
libcairo_script_interpreter_headers = \
libhicairo_script_interpreter_headers = \
cairo-script-private.h \
$(NULL)
......@@ -21,23 +21,23 @@ cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) $(glib_CFLAGS)
cairo_sphinx_LDADD = \
$(real_pthread_LIBS) \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la \
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la \
$(glib_LIBS) \
$(CAIRO_LDADD) \
$(shm_LIBS)
cairo_sphinx_DEPENDENCIES = \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
$(top_builddir)/boilerplate/libcairoboilerplate.la \
$(top_builddir)/src/libcairo.la
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la \
$(top_builddir)/boilerplate/libhicairoboilerplate.la \
$(top_builddir)/src/libhicairo.la
# Install rules to rebuild the libraries and add explicit dependencies
$(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
$(top_builddir)/boilerplate/libhicairoboilerplate.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libhicairoboilerplate.la
$(top_builddir)/src/libcairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la
$(top_builddir)/src/libhicairo.la:
cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libhicairo.la
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
$(top_builddir)/util/cairo-script/libhicairo-script-interpreter.la: $(top_builddir)/src/libhicairo.la
cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libhicairo-script-interpreter.la
......@@ -39,7 +39,7 @@ static void *_dlhandle = RTLD_NEXT;
if (name##_real == NULL) { \
name##_real = dlsym (_dlhandle, #name); \
if (name##_real == NULL && _dlhandle == RTLD_NEXT) { \