diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /vidix/kernelhelper/Makefile | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'vidix/kernelhelper/Makefile')
| -rw-r--r-- | vidix/kernelhelper/Makefile | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/vidix/kernelhelper/Makefile b/vidix/kernelhelper/Makefile deleted file mode 100644 index 4b810ec500..0000000000 --- a/vidix/kernelhelper/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -KERNEL_INC = /usr/src/linux/include -CFLAGS = -O2 -D__KERNEL__ -DMODULE -I$(KERNEL_INC) \ - -include $(KERNEL_INC)/linux/modversions.h -VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h | cut -d'"' -f2) -MDIR = /lib/modules/$(VERSION)/misc - -all: dhahelper.o test - -dhahelper.o: dhahelper.c dhahelper.h - -install: dhahelper.o - -mkdir -p $(MDIR) - install -m 644 dhahelper.o $(MDIR)/dhahelper.o - depmod -a - -dep depend: - -clean distclean: - rm -f *.o *~ test - -.PHONY: all install dep depend *clean |