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/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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d63729331..f35db8cb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/misc/Makefile.common -if !WIN32 - w32dll = libw32dll -endif - # Order is important be careful changing SUBDIRS SUBDIRS = \ xine-utils \ @@ -21,7 +17,7 @@ SUBDIRS = \ libsputext \ libdts \ libmad \ - $(w32dll) \ + libw32dll \ liblpcm \ libxinevdec \ libxineadec \ |