diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
| commit | 896d352d7c65545d648805885d54f7b10c17329c (patch) | |
| tree | 53411bc9808f67ffe9fad2590a1f77103c0eb010 /misc | |
| parent | e80b58148fe11ba0770e6e2927faca06d6408574 (diff) | |
| parent | e886af1e544dc7db4abad76bdb14fe53a5467ced (diff) | |
| download | xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.gz xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxinevdec/Makefile.am => src/video_dec/Makefile.am
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/Makefile.plugins.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index 783f269f7..38fdcf123 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -9,6 +9,7 @@ EXTRA_DIST = build_rpms.sh \ xine-lib.spec \ libxine.pc.in \ libdvdcss-1.2.6-network.patch \ + Makefile.plugins.in \ Makefile.common \ fonts/cetus.ttf diff --git a/misc/Makefile.plugins.in b/misc/Makefile.plugins.in new file mode 100644 index 000000000..adee79479 --- /dev/null +++ b/misc/Makefile.plugins.in @@ -0,0 +1 @@ +DESTDIR:=$(if $(DESTDIR),$(DESTDIR),@LIBTOOL_DESTDIR_DEFAULT@) |