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/xine-engine | |
| 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/xine-engine')
| -rw-r--r-- | src/xine-engine/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
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) |