diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
| commit | 69a1b10dd38c06f34747e7a55d62fdfcec2883cc (patch) | |
| tree | e10fd932e747549b9c88d3af4fa0dd81a8eb17e1 /src/xine-engine | |
| parent | b8578b7dfbada9cb57940bfec5b844ea0e871970 (diff) | |
| download | xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.gz xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.bz2 | |
*BUGFIX*
Build improvements and WIN32 port updates:
- add --with-pthread-pefix and --with-zlib-pefix options
- prepare for removing internal zlib and pthreads-win32 relics,
updated documentation for possible WIN32 developers (only for me? :->)
- fixed bug in unimportant part of configure.ac for MinGW due to xine paths
- fixed my bug in cdda (but it compiled fine anyway)
- fixed unimportant bug in planar Makefile.am
- next MSVC update due to external zlib, pthreads and latest changes,
removed relic includes
- checked distcheck
CVS patchset: 7719
CVS date: 2005/09/05 17:02:56
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/Makefile.am | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index b78d54af6..83b79f43b 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,22 +1,14 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) +AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la -INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la -INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la DEF_FILE = libxine-$(XINE_MAJOR).def -if HAVE_ZLIB -else -zlib_dep = $(INTERNAL_ZLIB_LIB) -endif -if HAVE_INTERNAL_WIN32_PTHREAD -pthread_dep = $(INTERNAL_PTHREAD_LIB) -endif if WIN32 def_ldflags="-Wl,--output-def,$(DEF_FILE)" endif @@ -34,7 +26,7 @@ EXTRA_DIST = lrb.c lrb.h accel_xvmc.h if INCLUDED_INTL INCLUDED_INTLLIBS = @INTLLIBS@ endif -libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) $(zlib_dep) \ +libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \ $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ @@ -66,9 +58,3 @@ endif $(XINEUTILS_LIB): $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la - -$(INTERNAL_PTHREAD_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib/pthreads libpthread.la - -$(INTERNAL_ZLIB_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib/zlib libzlib.la |