diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
| commit | ebdf62cd13f7976890cbf3703571fc55a20df47e (patch) | |
| tree | 2ce7eea59f7ff5173e2c91f550d86b9cfe2f392a /src/xine-engine/Makefile.am | |
| parent | 8c04de48fdd50d279f1b7d93f184006ca1db056a (diff) | |
| download | xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.gz xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.bz2 | |
Improvements and implementing Michael's suggestions:
- new flags added at the end, so the users can override them properly
- removed X11 libs and cflags from xine-config and libxine.pc
- removed replacing for setenv (thanks to Robin for the hint)
- better way for temporary disabling of w32dll module
- data directories will be different on Windows
- force installing catalogs with translation into XINE_LOCALEDIR
- timer linked in xine-engine (just central place for linking such stuff)
- adjusted load_plugins and remove reduntant WIN32 conditionals
- removed unused $(lib_thr)
CVS patchset: 6927
CVS date: 2004/09/01 18:19:49
Diffstat (limited to 'src/xine-engine/Makefile.am')
| -rw-r--r-- | src/xine-engine/Makefile.am | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 07d7f9806..6c22f2481 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -9,16 +9,15 @@ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la -SETENV_LIB = $(top_builddir)/win32/contrib/libsetenv.la +TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la if !HAVE_ZLIB zlib_lib = $(INTERNAL_ZLIB_LIB) endif if WIN32 -if !HAVE_SETENV -setenv_lib = $(SETENV_LIB) -endif dirent_lib = $(DIRENT_LIB) pthread_lib = $(INTERNAL_PTHREAD_LIB) +timer_lib = $(TIMER_LIB) +def_ldflags="-Wl,--output-def,libxine.def" endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ @@ -32,14 +31,13 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ EXTRA_DIST = lrb.c lrb.h libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_lib) \ - $(dirent_lib) $(pthread_lib) \ - $(setenv_lib) + $(dirent_lib) $(pthread_lib) $(timer_lib) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(dirent_lib) $(setenv_lib) + $(dirent_lib) $(timer_lib) libxine_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags) include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ @@ -65,5 +63,5 @@ $(INTERNAL_ZLIB_LIB): $(DIRENT_LIB): $(MAKE) -C $(top_builddir)/win32/contrib libdirent.la -$(SETENV_LIB): - $(MAKE) -C $(top_builddir)/win32/contrib libsetenv.la +$(TIMER_LIB): + $(MAKE) -C $(top_builddir)/win32/contrib libtimer.la |