diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-08-28 20:03:42 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-08-28 20:03:42 +0000 |
| commit | a2df0544eebb05b5be78fe6ce6358688d7df7de8 (patch) | |
| tree | bb010c34eda20e9041d405038ca1d441266cbbf5 /src/xine-engine/Makefile.am | |
| parent | 202bc840c6d4821d24a8b5b0c44037e2b38ee79d (diff) | |
| download | xine-lib-a2df0544eebb05b5be78fe6ce6358688d7df7de8.tar.gz xine-lib-a2df0544eebb05b5be78fe6ce6358688d7df7de8.tar.bz2 | |
Various fixes and improvements of mingw port:
- HAVE_SETENV
- Cygwin build
- win32/contrib Makefile
CVS patchset: 6915
CVS date: 2004/08/28 20:03:42
Diffstat (limited to 'src/xine-engine/Makefile.am')
| -rw-r--r-- | src/xine-engine/Makefile.am | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 09d42fd49..982a93c62 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -6,15 +6,19 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la -if !HAVE_ZLIB INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la -endif -if WIN32 DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la -endif -if !SETENV SETENV_LIB = $(top_builddir)/win32/contrib/libsetenv.la +if !HAVE_ZLIB +zlib_lib = $(INTERNAL_ZLIB_LIB) +endif +if WIN32 +dirent_lib = $(DIRENT_LIB) +pthread_lib = $(INTERNAL_PTHREAD_LIB) +endif +if !HAVE_SETENV +setenv_lib = $(SETENV_LIB) endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ @@ -27,12 +31,12 @@ 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) $(INTERNAL_ZLIB_LIB) \ - $(DIRENT_LIB) $(INTERNAL_PTHREAD_LIB) \ - $(SETENV_LIB) +libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_lib) \ + $(dirent_lib) $(pthread_lib) \ + $(setenv_lib) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(DIRENT_LIB) $(SETENV_LIB) + $(dirent_lib) $(setenv_lib) libxine_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |