From 00c9c88fda8396c1626095f313dc359d767f63b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sat, 4 Sep 2004 18:34:17 +0000 Subject: 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 --- src/video_out/libdha/Makefile.am | 4 +++- src/video_out/vidix/Makefile.am | 2 +- src/video_out/vidix/drivers/Makefile.am | 3 ++- src/video_out/vidix/drivers/mach64_vid.c | 4 ++-- src/xine-engine/Makefile.am | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src') 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 +#include #include "bswap.h" #include "mach64.h" diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 6c22f2481..f0f6d8d0b 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -11,11 +11,11 @@ DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la if !HAVE_ZLIB -zlib_lib = $(INTERNAL_ZLIB_LIB) +zlib_dep = $(INTERNAL_ZLIB_LIB) endif if WIN32 dirent_lib = $(DIRENT_LIB) -pthread_lib = $(INTERNAL_PTHREAD_LIB) +pthread_dep = $(INTERNAL_PTHREAD_LIB) timer_lib = $(TIMER_LIB) def_ldflags="-Wl,--output-def,libxine.def" endif @@ -30,8 +30,8 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h -libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_lib) \ - $(dirent_lib) $(pthread_lib) $(timer_lib) +libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_dep) \ + $(dirent_lib) $(pthread_dep) $(timer_lib) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ $(dirent_lib) $(timer_lib) -- cgit v1.2.3