# HG changeset patch
# User diego
# Date 1209214044 0
# Node ID 7b3c38ffae479a5afc22067ece54bd073987e34d
# Parent  f50aa0c7c3350227c9c08d9c8a8199d39dd0ea80
Merge vidix/Makefile into top-level Makefile.

diff -r f50aa0c7c335 -r 7b3c38ffae47 Makefile
--- a/Makefile	Sat Apr 26 11:17:17 2008 +0000
+++ b/Makefile	Sat Apr 26 12:47:24 2008 +0000
@@ -496,7 +496,28 @@
 SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
 SRCS_MPLAYER-$(LIRC)         += input/lirc.c
 
-SRCS_MPLAYER-$(VIDIX)         += libvo/vosub_vidix.c
+SRCS_MPLAYER-$(VIDIX)         += libvo/vosub_vidix.c \
+                                 vidix/vidixlib.c \
+                                 vidix/drivers.c \
+                                 vidix/dha.c \
+                                 vidix/mtrr.c \
+                                 vidix/pci.c \
+                                 vidix/pci_names.c \
+                                 vidix/pci_dev_ids.c\
+
+SRCS_MPLAYER-$(VIDIX_CYBERBLADE)        += vidix/cyberblade_vid.c
+SRCS_MPLAYER-$(VIDIX_IVTV)              += vidix/ivtv_vid.c
+SRCS_MPLAYER-$(VIDIX_MACH64)            += vidix/mach64_vid.c
+SRCS_MPLAYER-$(VIDIX_MGA)               += vidix/mga_vid.c
+SRCS_MPLAYER-$(VIDIX_MGA_CRTC2)         += vidix/mga_crtc2_vid.c
+SRCS_MPLAYER-$(VIDIX_NVIDIA)            += vidix/nvidia_vid.c
+SRCS_MPLAYER-$(VIDIX_PM2)               += vidix/pm2_vid.c
+SRCS_MPLAYER-$(VIDIX_PM3)               += vidix/pm3_vid.c
+SRCS_MPLAYER-$(VIDIX_RADEON)            += vidix/radeon_vid.c
+SRCS_MPLAYER-$(VIDIX_RAGE128)           += vidix/rage128_vid.c
+SRCS_MPLAYER-$(VIDIX_S3)                += vidix/s3_vid.c
+SRCS_MPLAYER-$(VIDIX_SIS)               += vidix/sis_vid.c vidix/sis_bridge.c
+SRCS_MPLAYER-$(VIDIX_UNICHROME)         += vidix/unichrome_vid.c
 
 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
 
@@ -538,8 +559,6 @@
 COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
 COMMON_LIBS-$(LIBMPEG2)           += libmpeg2/libmpeg2.a
 
-LIBS_MPLAYER-$(VIDIX)             += vidix/vidix.a
-
 ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
 
@@ -565,9 +584,6 @@
         libswscale \
         mp3lib \
 
-ifeq ($(VIDIX),yes)
-PARTS += vidix
-endif
 ifeq ($(WIN32DLL),yes)
 PARTS += loader
 endif
@@ -597,6 +613,7 @@
         stream/realrtsp \
         tremor \
         TOOLS \
+        vidix \
 
 all:	recurse $(ALL_PRG)
 
@@ -654,6 +671,14 @@
 
 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
 
+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.db
+	LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB)
+
+vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES)
+
 install: install-dirs $(INSTALL_TARGETS)
 
 install-dirs:
@@ -713,7 +738,7 @@
 clean:: toolsclean
 	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
 	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
-	  codecs.conf.h help_mp.h version.h TAGS tags
+	  codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES)
 	for part in $(PARTS); do $(MAKE) -C $$part clean; done
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir))))
 
diff -r f50aa0c7c335 -r 7b3c38ffae47 vidix/Makefile
--- a/vidix/Makefile	Sat Apr 26 11:17:17 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f50aa0c7c335 -r 7b3c38ffae47 vidix/pci_db2c.awk
--- a/vidix/pci_db2c.awk	Sat Apr 26 11:17:17 2008 +0000
+++ b/vidix/pci_db2c.awk	Sat Apr 26 12:47:24 2008 +0000
@@ -33,11 +33,11 @@
     }
     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);