diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-09-27 21:50:48 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-09-27 21:50:48 +0000 |
| commit | dffc33314454667cdaa1910e0f20d32d23114072 (patch) | |
| tree | 328a27f2ee2409d23dd5f13ff6b5fc8d9ef59416 | |
| parent | e8255ee9f28b3841bc591c656dd045be8e3a3301 (diff) | |
Add some additional gfx files to EXTRA_DIST On i386 add the file
nsc_asm_msr.S to the source files
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 20 |
2 files changed, 30 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a15acde..aef10c6 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AM_MAINTAINER_MODE # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC +AM_PROG_AS AH_TOP([#include "xorg-server.h"]) @@ -57,6 +58,16 @@ AC_HEADER_STDC AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) +is386=false + +case $host_cpu in + i*86) + is386=true + ;; +esac + +AM_CONDITIONAL([I386ARCH], [test $is386 = true]) + XORG_RELEASE_VERSION AC_OUTPUT([ diff --git a/src/Makefile.am b/src/Makefile.am index 7db3bab..aae28ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. AM_CFLAGS = @XORG_CFLAGS@ -I$(top_srcdir)/src/gfx -I$(top_srcdir)/src/panel +AM_CCASFLAGS = @XORG_CFLAGS@ nsc_drv_la_LTLIBRARIES = nsc_drv.la nsc_drv_la_LDFLAGS = -module -avoid-version nsc_drv_ladir = @moduledir@/drivers @@ -48,6 +49,10 @@ nsc_drv_la_SOURCES = \ nsc.h \ panel.c +if I386ARCH +nsc_drv_la_SOURCES += \ + nsc_msr_asm.S +endif EXTRA_DIST = \ nsc_galfns.c \ @@ -100,4 +105,17 @@ EXTRA_DIST = \ gfx/vid_1200.c \ gfx/vid_5530.c \ gfx/vid_rdcl.c \ - gfx/vip_1200.c + gfx/vip_1200.c \ + \ + gfx/durango.c \ + gfx/gfx_tv.h \ + gfx/history.h \ + gfx/release.txt \ + gfx/tv_fs450.c \ + gfx/tv_fs450.h \ + gfx/tv_fs451.c \ + gfx/tv_geode.c \ + gfx/vid_1400.c \ + gfx/vip_1400.c + + |