Commit 696dc132 authored by Aaron Holtzman's avatar Aaron Holtzman
Browse files

kernel includes patch from Stephen Crowley.

ah
parent 69ef1b15
......@@ -14,6 +14,8 @@ Contributions by (in no particular order):
David I. Lehn <dlehn@vt.edu> - motion_comp mmx code
Fredrik Vraalsen <vraalsen@cs.uiuc.edu> - general hackage and good stuff
Ryan C. Gordon <icculus@lokigames.com> - SDL support
Stephen Crowley <stephenc@dns2.digitalpassage.com> - build fixes
Bruno Barreyra <barreyra@ufl.edu> - build fixes
(let me know if I've forgotten anyone)
First of all, this is very early code. If you're not interested
......
......@@ -19,25 +19,6 @@ AC_LIBTOOL_DLOPEN
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
dnl
dnl Add pathname where linux header files are (optional)
dnl
AC_ARG_WITH(kernel-includes,
[ --with-kernel-includes using kernel header files],
[case "$withval" in
yes)
KERNEL_INCLUDES="-I/usr/src/linux/include"
;;
*)
KERNEL_INCLUDES="-I$withval"
;;
esac],[
KERNEL_INCLUDES="-I/usr/src/linux/include"
])
AC_SUBST(KERNEL_INCLUDES)
dnl
dnl Display driver probing...
dnl
......@@ -171,4 +152,14 @@ AC_SUBST(ROOT_CFLAGS)
AC_SUBST(LIBMPEG2_CFLAGS)
AC_SUBST(TOOLS_CFLAGS)
dnl
dnl get location of kernel headers
dnl
AC_ARG_WITH(kernel-headers,
[ --with-kernel-headers specify the location of the kernel headers
[/usr/src/linux/include] ],
[KERNEL_INCLUDES=$withval],
[KERNEL_INCLUDES=/usr/src/linux/include])
AC_SUBST(KERNEL_INCLUDES)
AC_OUTPUT( libmpeg2/Makefile tools/Makefile drivers/Makefile Makefile )
......@@ -2,16 +2,14 @@
AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
EXTRA_DIST = $(EXTRA_mga_vid_SOURCES) $(EXTRA_mga_vid_test_SOURCES)
EXTRA_mga_vid_SOURCES = mga_vid.c
EXTRA_mga_vid_test_SOURCES = mga_vid_test.c
INCLUDES = $(KERNEL_INCLUDES)
KERNEL_INCLUDES = @KERNEL_INCLUDES@
INCLUDES = -I$(KERNEL_INCLUDES)
CFLAGS = -g -O2 -Wall -D__KERNEL__ -DMODULE @MOD_CFLAGS@\
-include /usr/src/linux/include/linux/modversions.h
-include $(KERNEL_INCLUDES)/linux/modversions.h
noinst_HEADERS = mga_vid.h
......@@ -26,17 +24,13 @@ mga_vid.o:
mga_vid_test:
$(CC) -g -O -Wall $(INCLUDES) -o $@ $@.c
clean:
rm -f *.o
rm -f mga_vid_test mga_vid_test
mostlyclean-generic:
-rm -f *~ \#* .*~ .\#*
maintainer-clean-generic:
-@echo "This command is intended for maintainers to use;"
-@echo "it deletes files that may require special tools to rebuild."
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment