diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-26 12:47:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-26 12:47:24 +0000 |
| commit | 3f94c6185439438eff3207471faa1de9c8c06a0b (patch) | |
| tree | 696b2edaaf2c4bea7f99b39dba77815d107a8de3 /vidix | |
| parent | dc7ffa9855bf884b6916fd65f16c37275d9a15e5 (diff) | |
| download | mpv-3f94c6185439438eff3207471faa1de9c8c06a0b.tar.bz2 mpv-3f94c6185439438eff3207471faa1de9c8c06a0b.tar.xz | |
Merge vidix/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/Makefile | 46 | ||||
| -rw-r--r-- | vidix/pci_db2c.awk | 10 |
2 files changed, 5 insertions, 51 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/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); |