diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:14:20 +0200 |
| commit | dc7f1830224e1953fb07ffcc045735b2b15af310 (patch) | |
| tree | 3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /Makefile | |
| parent | 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (diff) | |
| parent | a0601ed2566d132fec57dcf163372f9f341f3c13 (diff) | |
| download | mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.bz2 mpv-dc7f1830224e1953fb07ffcc045735b2b15af310.tar.xz | |
Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -814,11 +814,11 @@ tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW) vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) -VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ - vidix/pci_names.h vidix/pci_vendors.h +VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_vendor_ids.h \ + vidix/pci_vendors.h $(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db - awk -f $^ $(VIDIX_PCIDB) + $^ $(VIDIX_PCIDB) VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) |