diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 23 | ||||
-rw-r--r-- | src/local_xf86Rename.h | 23 |
2 files changed, 1 insertions, 45 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2677d9c..70e127c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _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 = @XMODES_CFLAGS@ @XORG_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ nv_drv_la_LTLIBRARIES = nv_drv.la nv_drv_la_LDFLAGS = -module -avoid-version nv_drv_ladir = @moduledir@/drivers @@ -82,24 +82,3 @@ g80_sources = \ g80_xaa.c \ g80_xaa.h -xmode_sources = \ - @parser_dir@/xf86Parser.h \ - @parser_dir@/xf86Optrec.h \ - @modes_dir@/xf86Modes.h \ - @modes_dir@/xf86Modes.c \ - @modes_dir@/xf86cvt.c \ - @modes_dir@/xf86Crtc.h \ - @modes_dir@/xf86Crtc.c \ - @modes_dir@/xf86Cursors.c \ - @modes_dir@/xf86EdidModes.c \ - @modes_dir@/xf86gtf.c \ - @modes_dir@/xf86RandR12.c \ - @modes_dir@/xf86RandR12.h \ - @modes_dir@/xf86Rename.h \ - @modes_dir@/xf86Rotate.c \ - @modes_dir@/xf86DiDGA.c - -if BUILD_XMODES -EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h -nodist_nv_drv_la_SOURCES = $(xmode_sources) -endif diff --git a/src/local_xf86Rename.h b/src/local_xf86Rename.h deleted file mode 100644 index f3a07c6..0000000 --- a/src/local_xf86Rename.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - *Copyright © 2006 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#define XF86NAME(x) nv_##x |