diff options
author | Matt Turner <mattst88@gmail.com> | 2012-09-05 11:17:33 -0700 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-12-06 11:53:38 +0100 |
commit | 656b9fe10808ac6964433303ceb24504bae5dfc8 (patch) | |
tree | b4020a35709d6d8d25ece7e17504fa36a64a6034 | |
parent | 1a197072f5839e905f77f0191d3defd745d9055d (diff) |
targets/dri-swrast: Convert to automake
v2: Andreas Boll <andreas.boll.dev@gmail.com>
- Provide compatibility with scripts for the old Mesa build system
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-swrast/.gitignore | 1 | ||||
-rw-r--r-- | src/gallium/targets/dri-swrast/Makefile | 39 | ||||
-rw-r--r-- | src/gallium/targets/dri-swrast/Makefile.am | 56 |
4 files changed, 58 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 414b1812bc..f3fe8eae0c 100644 --- a/configure.ac +++ b/configure.ac @@ -2026,6 +2026,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/dri-r300/Makefile src/gallium/targets/dri-r600/Makefile src/gallium/targets/dri-radeonsi/Makefile + src/gallium/targets/dri-swrast/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile diff --git a/src/gallium/targets/dri-swrast/.gitignore b/src/gallium/targets/dri-swrast/.gitignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/src/gallium/targets/dri-swrast/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile deleted file mode 100644 index e83e0248b0..0000000000 --- a/src/gallium/targets/dri-swrast/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = swrast_dri.so - -DRIVER_DEFINES = \ - -D__NOT_HAVE_DRM_H -DGALLIUM_SOFTPIPE \ - -DGALLIUM_RBUG -DGALLIUM_TRACE - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/sw/libdrisw.a \ - $(TOP)/src/gallium/winsys/sw/dri/libswdri.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a - -ifeq ($(MESA_LLVM),1) -PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a -DRIVER_DEFINES += -DGALLIUM_LLVMPIPE -endif - -SWRAST_COMMON_GALLIUM_SOURCES = \ - $(TOP)/src/mesa/drivers/dri/common/utils.c \ - $(TOP)/src/mesa/drivers/dri/common/drisw_util.c \ - $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c - -C_SOURCES = \ - swrast_drm_api.c \ - $(SWRAST_COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -ASM_SOURCES = - -include ../Makefile.dri - -INCLUDES += \ - -I$(TOP)/src/gallium/winsys/sw/dri - -symlinks: diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am new file mode 100644 index 0000000000..0c1a8dbca2 --- /dev/null +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -0,0 +1,56 @@ +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ + $(LIBDRM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/winsys/sw/dri \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mapi \ + -DGALLIUM_RBUG \ + -DGALLIUM_TRACE \ + -DGALLIUM_SOFTPIPE \ + -D__NOT_HAVE_DRM_H + +dridir = $(DRI_DRIVER_INSTALL_DIR) +dri_LTLIBRARIES = swrast_dri.la + +swrast_dri_la_SOURCES = \ + swrast_drm_api.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + +swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + +swrast_dri_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(GALLIUM_DRI_LIB_DEPS) + +if HAVE_MESA_LLVM +swrast_dri_la_LINK = $(CXXLINK) $(swrast_dri_la_LDFLAGS) +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_swrast_dri_la_SOURCES = dummy-cpp.cpp + +AM_CPPFLAGS += -DGALLIUM_LLVMPIPE +swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) +else +swrast_dri_la_LINK = $(LINK) $(swrast_dri_la_LDFLAGS) +# Mention a dummy pure C file to trigger generation of the $(LINK) variable +nodist_EXTRA_swrast_dri_la_SOURCES = dummy-c.c +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: swrast_dri.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/gallium/swrast_dri.so |