debrix-driver-nv ChangeLog, NONE, 1.1 Makefile.am, 1.2, 1.3 configure.ac, 1.1, 1.2

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix-driver-nv
In directory pdx:/tmp/cvs-serv12467

Modified Files:
	Makefile.am configure.ac 
Added Files:
	ChangeLog 
Log Message:
* configure.ac:
* Makefile.am:
* nv/Makefile.am:
* riva/Makefile.am:
Now building two modules: libnv.la, and libriva128.la.

* nv/nv_include.h:
* nv/nv_video.c:
* riva/riva_include.h:
#include "Xv.h" -> <X11/extensions/Xv.h>


--- NEW FILE: ChangeLog ---
2004-06-28  Daniel Stone  <daniel at freedesktop.org>

	* autogen.sh:
	* configure.ac:
	* Makefile.am:
	* nv/Makefile.am:
	* riva/Makefile.am:
	Initial import of sources.

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix-driver-nv/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	28 Jun 2004 00:52:59 -0000	1.2
+++ Makefile.am	28 Jun 2004 01:09:06 -0000	1.3
@@ -1,26 +1,2 @@
 AUTOMAKE_OPTIONS = foreign
-
-driver_LTLIBRARIES = libnv.la
-
-libnv_drv_la_SOURCES = \
-                       nv/nv_driver.c \
-                       nv/nv_dac.c \
-                       nv/nv_setup.c \
-                       nv/nv_cursor.c \
-                       nv/nv_xaa.c \
-                       nv/nv_dga.c \
-                       nv/nv_shadow.c \
-                       nv/nv_hw.c \
-                       nv/nv_video.c
-
-libriva128_la_SOURCES = \
-                        riva/riva_driver.c \
-                        riva/riva_dac.c \
-                        riva/riva_setup.c \
-                        riva/riva_cursor.c \
-                        riva/riva_xaa.c \
-                        riva/riva_dga.c \
-                        riva/riva_shadow.c \
-                        riva/riva_hw.c
-
-libnv_la_SOURCES = $(libnv_drv_la_SOURCES) $(libriva128_la_SOURCES)
+SUBDIRS = nv riva

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/debrix-driver-nv/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	28 Jun 2004 00:52:59 -0000	1.1
+++ configure.ac	28 Jun 2004 01:09:06 -0000	1.2
@@ -23,7 +23,7 @@
 AM_CONDITIONAL(DRI, [ test "x$DRI" == "xyes" ])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, debrix)
+PKG_CHECK_MODULES(XORG, debrix xv)
 driverdir=$(pkg-config --variable=driverdir debrix)
 AC_SUBST([driverdir])
 sdkdir=$(pkg-config --variable=sdkdir debrix)
@@ -38,4 +38,6 @@
 # Checks for header files.
 AC_HEADER_STDC
 
-AC_OUTPUT([Makefile])
+AC_OUTPUT([Makefile
+           nv/Makefile
+           riva/Makefile])