[cairo-commit] build/Makefile.am.changelog configure.ac perf/Makefile.am

[Chris Wilson]

 build/Makefile.am.changelog |    2 +-
 configure.ac                |    3 +--
 perf/Makefile.am            |    5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 6d1c0e6d28ef61efbfa8f06f13840fd151cfb07e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 13 10:04:33 2011 +0100

    Fix pollution from skia commit
    
    I forgot to proof-read the patch before pushing and forgot I had left in
    some damage from trying to get skia to link using libtool.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/build/Makefile.am.changelog b/build/Makefile.am.changelog
index 861e531..07e6036 100644
--- a/build/Makefile.am.changelog
+++ b/build/Makefile.am.changelog
@@ -54,7 +54,7 @@ DISTCLEANFILES += ChangeLog.cache-*
 
 ChangeLog.cache-*..: .git
 
-#ChangeLog%: $(srcdir)/ChangeLog%
+ChangeLog%: $(srcdir)/ChangeLog%
 
 $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
 	@echo Creating $@
diff --git a/configure.ac b/configure.ac
index 0782baf..f659729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,7 @@ AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
-#AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
-AM_INIT_AUTOMAKE([1.9.6])
+AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
 AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
diff --git a/perf/Makefile.am b/perf/Makefile.am
index f3eb734..d41891f 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -43,13 +43,12 @@ libcairoperf_la_SOURCES = \
 	$(libcairoperf_headers)
 libcairoperf_la_LIBADD = $(CAIROPERF_LIBS)
 
-cairo_perf_trace_SOURCES = a.cpp \
+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 \
-	$(LDADD) $(CAIRO_LIBS)
-skia = -Wl,--start-group @skia_DIR@/out/Debug/obj.target/gyp/libeffects.a @skia_DIR@/out/Debug/obj.target/gyp/libimages.a @skia_DIR@/out/Debug/obj.target/gyp/libutils.a @skia_DIR@/out/Debug/obj.target/gyp/libopts.a @skia_DIR@/out/Debug/obj.target/gyp/libcore.a -Wl,--end-group
+	$(LDADD)
 cairo_perf_trace_DEPENDENCIES = \
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(LDADD)