From a5171860bcd55e56bacec9894c31c89d6b683494 Mon Sep 17 00:00:00 2001 From: Robin KAY Date: Mon, 30 Aug 2004 00:55:18 +0000 Subject: Fix the way the library path is supplied when testing for libdga. Disable compilation of win32/contrib/setenv.c on non-Win32 platforms (I don't see why it's necessary at all as we have xine_setenv). Front-ends use symbols in src/xine-utils but these aren't being exported in libxine.so because they come from an internal archive library. Compile xmlparser.c in src/xine-engine/Makefile.am for now (is there a better solution?). CVS patchset: 6917 CVS date: 2004/08/30 00:55:18 --- src/xine-engine/Makefile.am | 6 +++--- src/xine-utils/Makefile.am | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 982a93c62..eb2d96a28 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -14,12 +14,12 @@ 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 +dirent_lib = $(DIRENT_LIB) +pthread_lib = $(INTERNAL_PTHREAD_LIB) +endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ load_plugins.c video_decoder.c buffer_types.c \ diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index d2d9699ed..3fefad590 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -28,7 +28,6 @@ libxineutils_la_SOURCES = $(pppc_files) \ xine_check.c \ xine_mutex.c \ xmllexer.c \ - xmlparser.c \ xine_buffer.c libxineutils_la_DEPENDENCIES = $(TIMER_LIB) -- cgit v1.2.3