---
configure.ac | 1 +
src/gallium/drivers/llvmpipe/.gitignore | 1 +
src/gallium/drivers/llvmpipe/Makefile | 75 -----------------------
src/gallium/drivers/llvmpipe/Makefile.am | 95 ++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+), 75 deletions(-)
delete mode 100644 src/gallium/drivers/llvmpipe/Makefile
create mode 100644 src/gallium/drivers/llvmpipe/Makefile.am
diff --git a/configure.ac b/configure.ac
index fbb6ca4..162cedd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2020,6 +2020,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/auxiliary/pipe-loader/Makefile
src/gallium/drivers/Makefile
src/gallium/drivers/i915/Makefile
+ src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
src/gallium/drivers/rbug/Makefile
diff --git a/src/gallium/drivers/llvmpipe/.gitignore
b/src/gallium/drivers/llvmpipe/.gitignore
index 21cd3cf..217626a 100644
--- a/src/gallium/drivers/llvmpipe/.gitignore
+++ b/src/gallium/drivers/llvmpipe/.gitignore
@@ -4,3 +4,4 @@ lp_test_blend
lp_test_conv
lp_test_format
lp_test_printf
+Makefile
diff --git a/src/gallium/drivers/llvmpipe/Makefile
b/src/gallium/drivers/llvmpipe/Makefile
deleted file mode 100644
index ef16fc7..0000000
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = llvmpipe
-
-C_SOURCES = \
- lp_bld_alpha.c \
- lp_bld_blend.c \
- lp_bld_blend_aos.c \
- lp_bld_blend_logicop.c \
- lp_bld_blend_soa.c \
- lp_bld_depth.c \
- lp_bld_interp.c \
- lp_clear.c \
- lp_context.c \
- lp_draw_arrays.c \
- lp_fence.c \
- lp_flush.c \
- lp_jit.c \
- lp_memory.c \
- lp_perf.c \
- lp_query.c \
- lp_rast.c \
- lp_rast_debug.c \
- lp_rast_tri.c \
- lp_scene.c \
- lp_scene_queue.c \
- lp_screen.c \
- lp_setup.c \
- lp_setup_line.c \
- lp_setup_point.c \
- lp_setup_tri.c \
- lp_setup_vbuf.c \
- lp_state_blend.c \
- lp_state_clip.c \
- lp_state_derived.c \
- lp_state_fs.c \
- lp_state_setup.c \
- lp_state_gs.c \
- lp_state_rasterizer.c \
- lp_state_sampler.c \
- lp_state_so.c \
- lp_state_surface.c \
- lp_state_vertex.c \
- lp_state_vs.c \
- lp_surface.c \
- lp_tex_sample.c \
- lp_texture.c \
- lp_tile_image.c \
- lp_tile_soa.c
-
-CPP_SOURCES = \
-
-PROGS := lp_test_format \
- lp_test_arit \
- lp_test_blend \
- lp_test_conv \
- lp_test_printf
-
-# Need this for the lp_test_*.o files
-CLEAN_EXTRA = *.o
-
-include ../../Makefile.template
-
-PROGS_DEPS := ../../auxiliary/libgallium.a
-
-lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py
../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
- $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py
../../auxiliary/util/u_format.csv > $@
-
-LDFLAGS += $(LLVM_LDFLAGS)
-LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
-LD=$(CXX)
-
-$(PROGS): lp_test_main.o libllvmpipe.a
-
diff --git a/src/gallium/drivers/llvmpipe/Makefile.am
b/src/gallium/drivers/llvmpipe/Makefile.am
new file mode 100644
index 0000000..982c478
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -0,0 +1,95 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/include \
+ $(GALLIUM_CFLAGS)
+AM_CFLAGS = $(LLVM_CFLAGS)
+AM_CXXFLAGS= $(LLVM_CXXFLAGS)
+
+noinst_LTLIBRARIES = libllvmpipe.la
+
+libllvmpipe_la_SOURCES = \
+ lp_bld_alpha.c \
+ lp_bld_blend.c \
+ lp_bld_blend_aos.c \
+ lp_bld_blend_logicop.c \
+ lp_bld_blend_soa.c \
+ lp_bld_depth.c \
+ lp_bld_interp.c \
+ lp_clear.c \
+ lp_context.c \
+ lp_draw_arrays.c \
+ lp_fence.c \
+ lp_flush.c \
+ lp_jit.c \
+ lp_memory.c \
+ lp_perf.c \
+ lp_query.c \
+ lp_rast.c \
+ lp_rast_debug.c \
+ lp_rast_tri.c \
+ lp_scene.c \
+ lp_scene_queue.c \
+ lp_screen.c \
+ lp_setup.c \
+ lp_setup_line.c \
+ lp_setup_point.c \
+ lp_setup_tri.c \
+ lp_setup_vbuf.c \
+ lp_state_blend.c \
+ lp_state_clip.c \
+ lp_state_derived.c \
+ lp_state_fs.c \
+ lp_state_setup.c \
+ lp_state_gs.c \
+ lp_state_rasterizer.c \
+ lp_state_sampler.c \
+ lp_state_so.c \
+ lp_state_surface.c \
+ lp_state_vertex.c \
+ lp_state_vs.c \
+ lp_surface.c \
+ lp_tex_sample.c \
+ lp_texture.c \
+ lp_tile_image.c \
+ lp_tile_soa.c
+
+libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS)
+
+check_PROGRAMS = \
+ lp_test_format \
+ lp_test_arit \
+ lp_test_blend \
+ lp_test_conv \
+ lp_test_printf
+TESTS = $(check_PROGRAMS)
+
+lp_test_format_SOURCES = lp_test_format.c lp_test_main.c
+lp_test_format_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la
$(LLVM_LIBS)
+nodist_EXTRA_lp_test_format_SOURCES = dummy.cpp
+
+lp_test_arit_SOURCES = lp_test_arit.c lp_test_main.c
+lp_test_arit_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+nodist_EXTRA_lp_test_arit_SOURCES = dummy.cpp
+
+lp_test_blend_SOURCES = lp_test_blend.c lp_test_main.c
+lp_test_blend_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+nodist_EXTRA_lp_test_blend_SOURCES = dummy.cpp
+
+lp_test_conv_SOURCES = lp_test_conv.c lp_test_main.c
+lp_test_conv_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
+nodist_EXTRA_lp_test_conv_SOURCES = dummy.cpp
+
+lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
+lp_test_printf_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la
$(LLVM_LIBS)
+nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
+
+BUILT_SOURCES = lp_tile_soa.c
+CLEANFILES = lp_tile_soa.c
+
+lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py
../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
+ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py
../../auxiliary/util/u_format.csv > $@
+
+all-local: libllvmpipe.la
+ ln -f $(builddir)/.libs/libllvmpipe.a $(builddir)/libllvmpipe.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
