diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-28 03:58:36 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-28 12:15:18 +0300 |
| commit | 2faffe2a7f4076beb461c34428d42b13e0414283 (patch) | |
| tree | 3b7a3ea0d74a4e92f1310ace9ef60663d0eed20b /vidix | |
| parent | 38d50e936919cbe03264c8c03fe40fc3af87d95c (diff) | |
| parent | ae09115f2b50e5c5d82383803dbfb25eb8f2e137 (diff) | |
| download | mpv-2faffe2a7f4076beb461c34428d42b13e0414283.tar.bz2 mpv-2faffe2a7f4076beb461c34428d42b13e0414283.tar.xz | |
Merge svn changes up to r26555
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/Makefile | 46 | ||||
| -rw-r--r-- | vidix/dhahelperwin/Makefile | 4 | ||||
| -rw-r--r-- | vidix/kernelhelper/Makefile | 4 | ||||
| -rw-r--r-- | vidix/pci_db2c.awk | 10 |
4 files changed, 7 insertions, 57 deletions
diff --git a/vidix/Makefile b/vidix/Makefile deleted file mode 100644 index 6eeb66a444..0000000000 --- a/vidix/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -include ../config.mak - -LIBNAME_MPLAYER = vidix.a - -SRCS_MPLAYER = vidixlib.c \ - drivers.c \ - dha.c \ - mtrr.c \ - pci.c \ - pci_names.c \ - pci_dev_ids.c\ - -SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += cyberblade_vid.c -SRCS_MPLAYER-$(VIDIX_IVTV) += ivtv_vid.c -SRCS_MPLAYER-$(VIDIX_MACH64) += mach64_vid.c -SRCS_MPLAYER-$(VIDIX_MGA) += mga_vid.c -SRCS_MPLAYER-$(VIDIX_MGA_CRTC2) += mga_crtc2_vid.c -SRCS_MPLAYER-$(VIDIX_NVIDIA) += nvidia_vid.c -SRCS_MPLAYER-$(VIDIX_PM2) += pm2_vid.c -SRCS_MPLAYER-$(VIDIX_PM3) += pm3_vid.c -SRCS_MPLAYER-$(VIDIX_RADEON) += radeon_vid.c -SRCS_MPLAYER-$(VIDIX_RAGE128) += rage128_vid.c -SRCS_MPLAYER-$(VIDIX_S3) += s3_vid.c -SRCS_MPLAYER-$(VIDIX_SIS) += sis_vid.c sis_bridge.c -SRCS_MPLAYER-$(VIDIX_UNICHROME) += unichrome_vid.c - -# If you want libdha to use svgalib_helper for hardware access, -# uncomment this statement, and change the -I to the correct directory -# that includes svgalib_helper.o: -#CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/ - -PCI_FILES = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h - -libs: $(PCI_FILES) - -.depend: $(PCI_FILES) - -include ../mpcommon.mak - -$(OBJS_MPLAYER): $(PCI_FILES) - -$(PCI_FILES): pci.db - LC_ALL=C awk -f pci_db2c.awk $< $(VIDIX_PCIDB) - -clean:: - rm -f $(PCI_FILES) diff --git a/vidix/dhahelperwin/Makefile b/vidix/dhahelperwin/Makefile index d6f8f94408..a35d5b66e5 100644 --- a/vidix/dhahelperwin/Makefile +++ b/vidix/dhahelperwin/Makefile @@ -33,9 +33,7 @@ dhahelper.sys: temp.exp dhahelper.o dhahelper-rc.o -lntoskrnl strip $@ -clean: +clean distclean: rm -f *.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp -distclean: clean - .PHONY: all clean distclean diff --git a/vidix/kernelhelper/Makefile b/vidix/kernelhelper/Makefile index f34e408aaf..4b810ec500 100644 --- a/vidix/kernelhelper/Makefile +++ b/vidix/kernelhelper/Makefile @@ -15,9 +15,7 @@ install: dhahelper.o dep depend: -clean: +clean distclean: rm -f *.o *~ test -distclean: clean - .PHONY: all install dep depend *clean diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index 38bfca1407..eecdb31714 100644 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -33,11 +33,11 @@ BEGIN { } in_file = ARGV[1]; with_pci_db = ARGV[2]; - vendor_file = "pci_vendors.h"; - ids_file = "pci_ids.h" - name_file = "pci_names.c" - name_h_file = "pci_names.h" - dev_ids_file = "pci_dev_ids.c" + vendor_file = "vidix/pci_vendors.h"; + ids_file = "vidix/pci_ids.h" + name_file = "vidix/pci_names.c" + name_h_file = "vidix/pci_names.h" + dev_ids_file = "vidix/pci_dev_ids.c" line=0; # print out head lines print_head(vendor_file); |