build: make distcheck work

Mostly taken from Marc's branch, just didn't change
as much stuff around
macos/master
Dave Airlie 10 years ago
parent 6c33fee9dc
commit 4a6383f4ce
  1. 12
      src/Makefile.am
  2. 59
      src/gallium/auxiliary/Makefile.am
  3. 16
      tests/Makefile.am

@ -18,12 +18,19 @@ AM_CFLAGS = \
$(CODE_COVERAGE_CFLAGS) $(CODE_COVERAGE_CFLAGS)
libvrend_la_SOURCES = \ libvrend_la_SOURCES = \
virgl_hw.h \
virgl_protocol.h \
vrend_iov.h \
vrend_renderer.c \ vrend_renderer.c \
vrend_renderer.h \
vrend_shader.c \ vrend_shader.c \
vrend_shader.h \
vrend_object.c \ vrend_object.c \
vrend_object.h \
vrend_decode.c \ vrend_decode.c \
vrend_formats.c \ vrend_formats.c \
vrend_blitter.c \ vrend_blitter.c \
vrend_blitter.h \
iov.c \ iov.c \
vrend_renderer_helper.c \ vrend_renderer_helper.c \
virgl_egl_context.c virgl_egl_context.c
@ -39,6 +46,9 @@ libvirglrenderer_la_LIBADD = libvrend.la gallium/auxiliary/libgallium.la
libvirglrenderer_la_LDFLAGS = $(GM_LDFLAGS) $(EPOXY_LDFLAGS) libvirglrenderer_la_LDFLAGS = $(GM_LDFLAGS) $(EPOXY_LDFLAGS)
libvirglrendererincludedir = ${includedir} libvirglrendererincludedir = ${includedir}
libvirglrendererinclude_HEADERS = virglrenderer.h virgl_helper.h libvirglrendererinclude_HEADERS = virglrenderer.h virgl_helper.h virgl_egl.h
EXTRA_DIST = gallium/include
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

@ -15,7 +15,64 @@ AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
libgallium_la_SOURCES = \ libgallium_la_SOURCES = \
$(C_SOURCES) \ $(C_SOURCES) \
$(GENERATED_SOURCES) $(GENERATED_SOURCES) \
util/rgtc.h \
util/u_atomic.h \
util/u_bitmask.h \
util/u_box.h \
util/u_cpu_detect.h \
util/u_debug.h \
util/u_debug_describe.h \
util/u_debug_refcnt.h \
util/u_double_list.h \
util/u_dual_blend.h \
util/u_format.h \
util/u_format_etc.h \
util/u_format_latc.h \
util/u_format_other.h \
util/u_format_r11g11b10f.h \
util/u_format_rgb9e5.h \
util/u_format_rgtc.h \
util/u_format_s3tc.h \
util/u_format_srgb.h \
util/u_format_yuv.h \
util/u_format_zs.h \
util/u_half.h \
util/u_hash_table.h \
util/u_inlines.h \
util/u_math.h \
util/u_memory.h \
util/u_pack_color.h \
util/u_pointer.h \
util/u_prim.h \
util/u_rect.h \
util/u_string.h \
util/u_surface.h \
util/u_texture.h \
util/u_tile.h \
cso_cache/cso_cache.h \
cso_cache/cso_hash.h \
tgsi/tgsi_build.h \
tgsi/tgsi_dump.h \
tgsi/tgsi_exec.h \
tgsi/tgsi_info.h \
tgsi/tgsi_iterate.h \
tgsi/tgsi_opcode_tmp.h \
tgsi/tgsi_parse.h \
tgsi/tgsi_sanity.h \
tgsi/tgsi_scan.h \
tgsi/tgsi_strings.h \
tgsi/tgsi_text.h \
tgsi/tgsi_transform.h \
tgsi/tgsi_ureg.h \
tgsi/tgsi_util.h \
os/os_memory.h \
os/os_memory_stdc.h \
os/os_memory_aligned.h \
os/os_misc.h \
os/os_process.h \
os/os_time.h \
os/os_thread.h
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

@ -7,7 +7,11 @@ TEST_LIBS = libvrtest.la $(top_builddir)/src/libvirglrenderer.la $(CHECK_LIBS)
run_tests = test_virgl_init test_virgl_transfer test_virgl_resource test_virgl_cmd run_tests = test_virgl_init test_virgl_transfer test_virgl_resource test_virgl_cmd
noinst_LTLIBRARIES = libvrtest.la noinst_LTLIBRARIES = libvrtest.la
libvrtest_la_SOURCES = testvirgl.c testvirgl_encode.c libvrtest_la_SOURCES = testvirgl.c \
testvirgl.h \
testvirgl_encode.c \
testvirgl_encode.h
noinst_PROGRAMS = $(run_tests) noinst_PROGRAMS = $(run_tests)
TESTS = $(run_tests) TESTS = $(run_tests)
@ -28,16 +32,18 @@ test_virgl_cmd_LDADD = $(TEST_LIBS)
test_virgl_cmd_LDFLAGS = -no-install test_virgl_cmd_LDFLAGS = -no-install
if HAVE_VALGRIND if HAVE_VALGRIND
VALGRIND_FLAGS=--leak-check=full \ VALGRIND_FLAGS= \
--quiet \ --leak-check=full \
--error-exitcode=3 \ --quiet \
--suppressions=$(srcdir)/valgrind.suppressions --error-exitcode=3 \
--suppressions=$(srcdir)/valgrind.suppressions
valgrind: valgrind:
$(MAKE) check-TESTS LOG_COMPILER="$(VALGRIND)" LOG_FLAGS="$(VALGRIND_FLAGS)" CK_FORK=no $(MAKE) check-TESTS LOG_COMPILER="$(VALGRIND)" LOG_FLAGS="$(VALGRIND_FLAGS)" CK_FORK=no
check: valgrind check: valgrind
EXTRA_DIST = valgrind.suppressions
endif endif
endif endif

Loading…
Cancel
Save