From: Frantisek D. <va...@us...> - 2005-09-05 17:03:15
|
Update of /cvsroot/xine/xine-lib/src/xine-engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3123/src/xine-engine Modified Files: Makefile.am Log Message: *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 Index: Makefile.am =================================================================== RCS file: /cvsroot/xine/xine-lib/src/xine-engine/Makefile.am,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- Makefile.am 29 Aug 2005 15:28:16 -0000 1.107 +++ Makefile.am 5 Sep 2005 17:02:57 -0000 1.108 @@ -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 @@ 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 @@ $(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 |