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

8 files changed, 20 insertions, 20 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 150427916..17e1142b7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -159,6 +159,7 @@ maintainer-clean: distclean
 	rm -f $(GMOFILES)
 
 # generate POTFILES.in before updating po-files
+# This isn't done for read-only source directory!
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	(cd $(top_srcdir); \
@@ -166,8 +167,9 @@ dist distdir:
 	 /tmp/POTFILES.in && \
 	 find src -name "*.[chy]" | \
 	 xargs grep -l '[^A-Za-z_]_(' | \
-	 grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in && \
-	 cp /tmp/POTFILES.in po/)
+	 grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in)
+	-cp /tmp/POTFILES.in $(srcdir)
+	rm -f /tmp/POTFILES.in
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
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"
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)
diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am
index a8dfb0cb2..8535ffc9a 100644
--- a/win32/contrib/pthreads/Makefile.am
+++ b/win32/contrib/pthreads/Makefile.am
@@ -2,7 +2,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C
 
-EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTIRS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw
+EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw
 
 if WIN32
 noinst_LTLIBRARIES = libpthread.la
diff --git a/win32/contrib/zlib/Makefile.am b/win32/contrib/zlib/Makefile.am
index 56c4831ea..b29d35e52 100644
--- a/win32/contrib/zlib/Makefile.am
+++ b/win32/contrib/zlib/Makefile.am
@@ -2,12 +2,9 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = inffixed.h ChangeLog FAQ INDEX README example.c maketree.c \
              minigzip.c zlib.3 algorithm.txt build.tar.gz nt/Makefile.emx \
-             nt/Makefile.gcc nt/Makefile.nt zlib.dnt
+             nt/Makefile.gcc nt/Makefile.nt nt/zlib.dnt
 
-if HAVE_ZLIB
-#install_h = zconf.h zlib.h zutil.h
-else
-#noinst_h = zconf.h zlib.h zutil.h
+if !HAVE_ZLIB
 link_zlib = libzlib.la
 endif
 
@@ -17,7 +14,5 @@ libzlib_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c infblock.c \
                   infcodes.c inffast.c inflate.c inftrees.c infutil.c \
                   trees.c uncompr.c zutil.c
 
-#install_HEADERS = $(install_h)
-
 noinst_HEADERS = deflate.h infblock.h infcodes.h inffast.h inftrees.h \
-                 infutil.h trees.h $(noinst_h) zconf.h zlib.h zutil.h
+                 infutil.h trees.h zconf.h zlib.h zutil.h