Split libcairotest files out from test/ and into boilerplate/

The idea here is to setup boilerplate to allow code sharing between
test/ and the upcoming perf/
This commit is contained in:
Carl Worth 2006-08-30 15:34:27 -07:00
parent a5f068e10d
commit 7f4e83ceeb
18 changed files with 46 additions and 28 deletions

5
.gitignore vendored
View file

@ -1,3 +1,6 @@
.deps
.libs
cairo-manual-*
ChangeLog*
Makefile
Makefile.in
@ -22,4 +25,6 @@ stamp-h
stamp-h1
stamp-h.in
*~
*.la
*.lo
*.orig

35
boilerplate/Makefile.am Normal file
View file

@ -0,0 +1,35 @@
noinst_LTLIBRARIES = libcairotest.la
libcairotest_la_SOURCES =\
buffer-diff.c \
buffer-diff.h \
cairo-test.c \
cairo-test.h \
read-png.c \
read-png.h \
write-png.c \
write-png.h \
xmalloc.c \
xmalloc.h
if CAIRO_HAS_BEOS_SURFACE
libcairotest_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
# BeOS system headers trigger this warning
libcairotest_la_CXXFLAGS = -Wno-multichar
endif
if CAIRO_HAS_DIRECTFB_SURFACE
libcairotest_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
endif
# We're using _GNU_SOURCE to get the prototype for asprintf. This may
# not be the most portable approach, but it is pragmatic and I'm
# willing to do something cleaner as soon as it causes someone a
# problem.
INCLUDES = \
-D_GNU_SOURCE \
-I$(srcdir) \
-I$(top_srcdir)/pixman/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
$(CAIRO_CFLAGS)

View file

@ -779,6 +779,7 @@ _EOF
])
AC_CONFIG_FILES([
Makefile
boilerplate/Makefile
pixman/Makefile
pixman/src/Makefile
src/Makefile

View file

@ -1,3 +1,5 @@
SUBDIRS=../boilerplate
# Here are all the tests that are run unconditionally
TESTS = \
a8-mask \
@ -373,37 +375,12 @@ SUPPORT_PROGS =
# problem.
INCLUDES = \
-D_GNU_SOURCE \
-I$(srcdir) \
-I$(top_srcdir)/boilerplate \
-I$(top_srcdir)/pixman/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
$(CAIRO_CFLAGS)
EXTRA_LTLIBRARIES = libcairotest.la
libcairotest_la_SOURCES =\
buffer-diff.c \
buffer-diff.h \
cairo-test.c \
cairo-test.h \
read-png.c \
read-png.h \
write-png.c \
write-png.h \
xmalloc.c \
xmalloc.h
if CAIRO_HAS_BEOS_SURFACE
libcairotest_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
# BeOS system headers trigger this warning
libcairotest_la_CXXFLAGS = -Wno-multichar
endif
if CAIRO_HAS_DIRECTFB_SURFACE
libcairotest_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
endif
LDADD = libcairotest.la $(top_builddir)/src/libcairo.la
LDADD = $(top_builddir)/boilerplate/libcairotest.la $(top_builddir)/src/libcairo.la
if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
LDADD += $(GLITZ_AGL_LIBS)
@ -500,7 +477,7 @@ html:
rehtml:
@$(MAKE) $(AM_MAKEFLAGS) TESTS="$(FAILED_TESTS)" html
$(TESTS): $(SUPPORT_PROGS)
$(TESTS): all $(SUPPORT_PROGS)
%.log: %
-./$<