diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-04 18:34:17 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-04 18:34:17 +0000 |
| commit | 00c9c88fda8396c1626095f313dc359d767f63b1 (patch) | |
| tree | 57df444bb50af84499c5df81032f19d9ecbbe04e /src/video_out | |
| parent | 16c18f3033903458761f0377e0d56455320e33b4 (diff) | |
| download | xine-lib-00c9c88fda8396c1626095f313dc359d767f63b1.tar.gz xine-lib-00c9c88fda8396c1626095f313dc359d767f63b1.tar.bz2 | |
Fix some 'make distcheck' problems.
Fix srcdir != buiddir problem with vidix.
Change some "_lib" variables to more clear name "_dep".
CVS patchset: 6938
CVS date: 2004/09/04 18:34:17
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/libdha/Makefile.am | 4 | ||||
| -rw-r--r-- | src/video_out/vidix/Makefile.am | 2 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 3 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/mach64_vid.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am index 958a95853..d386aa0e7 100644 --- a/src/video_out/libdha/Makefile.am +++ b/src/video_out/libdha/Makefile.am @@ -11,10 +11,12 @@ dha_lib = libdha.la endif awk_generated = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h +CLEANFILES = $(awk_generated) noinst_LTLIBRARIES = $(dha_lib) -libdha_la_SOURCES = libdha.c mtrr.c pci.c pci_names.c mmi.c ports.c irq.c cpu_flush.c +libdha_la_SOURCES = libdha.c mtrr.c pci.c mmi.c ports.c irq.c cpu_flush.c +nodist_libdha_la_SOURCES = pci_names.c EXTRA_PROGRAMS = test diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am index 7621a035a..e2f8665be 100644 --- a/src/video_out/vidix/Makefile.am +++ b/src/video_out/vidix/Makefile.am @@ -18,4 +18,4 @@ libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) noinst_HEADERS = fourcc.h vidix.h vidixlib.h AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_srcdir)/src/video_out/libdha + -I$(top_builddir)/src/video_out/libdha diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 9d41ae6a3..cc162e8fc 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -83,4 +83,5 @@ noinst_HEADERS = mach64.h nvidia.h glint_regs.h pm3_regs.h radeon.h \ cyberblade_regs.h sis_defs.h sis_regs.h AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_srcdir)/src/video_out/libdha + -I$(top_srcdir)/src/video_out/libdha \ + -I$(top_builddir)/src/video_out/libdha diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/src/video_out/vidix/drivers/mach64_vid.c index 0f965234f..41608e28a 100644 --- a/src/video_out/vidix/drivers/mach64_vid.c +++ b/src/video_out/vidix/drivers/mach64_vid.c @@ -24,8 +24,8 @@ #include "vidix.h" #include "fourcc.h" #include "libdha.h" -#include "pci_ids.h" -#include "pci_names.h" +#include <pci_ids.h> +#include <pci_names.h> #include "bswap.h" #include "mach64.h" |