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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/contrib/pthreads/Makefile.am | 2 | ||||
| -rw-r--r-- | win32/contrib/zlib/Makefile.am | 11 |
2 files changed, 4 insertions, 9 deletions
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 |