summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am67
1 files changed, 7 insertions, 60 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 098a94a9..9df09159 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = xvmc render_program legacy
+SUBDIRS = render_program legacy
# this is obnoxious:
# -module lets us name the module exactly how we want
@@ -38,6 +38,11 @@ SUBDIRS += sna
intel_drv_la_LIBADD += sna/libsna.la
endif
+if UXA
+SUBDIRS += uxa
+intel_drv_la_LIBADD += uxa/libuxa.la
+endif
+
NULL:=#
intel_drv_la_SOURCES = \
@@ -45,70 +50,12 @@ intel_drv_la_SOURCES = \
intel_list.h \
intel_options.h \
intel_device.c \
+ intel_driver.h \
intel_options.c \
intel_module.c \
compat-api.h \
$(NULL)
-if UXA
-AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
-AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
-intel_drv_la_LIBADD += @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ ../uxa/libuxa.la
-intel_drv_la_SOURCES += \
- brw_defines.h \
- brw_structs.h \
- common.h \
- intel.h \
- intel_batchbuffer.c \
- intel_batchbuffer.h \
- intel_display.c \
- intel_driver.c \
- intel_driver.h \
- intel_glamor.h \
- intel_memory.c \
- intel_uxa.c \
- intel_video.c \
- intel_video.h \
- i830_3d.c \
- i830_render.c \
- i830_reg.h \
- i915_3d.h \
- i915_reg.h \
- i915_3d.c \
- i915_render.c \
- i915_video.c \
- i965_reg.h \
- i965_3d.c \
- i965_video.c \
- i965_render.c \
- $(NULL)
-
-if GLAMOR
-AM_CFLAGS += @LIBGLAMOR_CFLAGS@
-intel_drv_la_LIBADD += @LIBGLAMOR_LIBS@
-intel_drv_la_SOURCES += \
- intel_glamor.c \
- $(NULL)
-endif
-
-if DRI2
-intel_drv_la_SOURCES += \
- intel_dri.c \
- $(NULL)
-intel_drv_la_LIBADD += \
- $(DRI_LIBS) \
- @CLOCK_GETTIME_LIBS@ \
- $(NULL)
-endif
-
-if XVMC
-intel_drv_la_SOURCES += \
- intel_hwmc.h \
- intel_hwmc.c \
- $(NULL)
-endif
-endif
-
EXTRA_DIST = \
scripts/clock.5c \
scripts/clock-graph.5c \