diff options
| author | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
| commit | a6ad50402cb879b08de95f94959bb1f59701c1ff (patch) | |
| tree | 9ee9fc89a52d8791b272721a910ea5c11d4e4aa7 /src/Makefile.am | |
| parent | e9916b9d496fd0b4df717892dda33f81a2e2990a (diff) | |
| parent | c4565a9811487402d899d0933cc63e27ffe1ff08 (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
configure.ac
src/reg_dumper/Makefile.am
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6b812f94..e3bbdcea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,6 +37,10 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_ladir = @moduledir@/drivers +intel_drv_la_LIBADD = +if XSERVER_LIBPCIACCESS +intel_drv_la_LIBADD += @PCIACCESS_LIBS@ +endif XMODE_SRCS=\ local_xf86Rename.h \ @@ -103,6 +107,7 @@ intel_drv_la_SOURCES = \ i830_driver.c \ i830_dvo.c \ i830.h \ + i830_hdmi.c \ i830_i2c.c \ i830_io.c \ i830_lvds.c \ @@ -186,7 +191,7 @@ if HAVE_GEN4ASM SUFFIXES = .g4a .g4b .g4a.g4b: - m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m + m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m $(INTEL_G4B): $(INTEL_G4I) @@ -204,6 +209,8 @@ endif if DRI intel_drv_la_SOURCES += \ $(INTEL_DRI_SRCS) +intel_drv_la_LIBADD += \ + $(DRI_LIBS) endif if XVMC |