[libbluray-devel] Merge makefiles

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Feb  4 09:13:39 2015 +0200| [a3fe13c3919294af4bd5ba7244cf78fdc0823b08] | committer: hpi1

Merge makefiles

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=a3fe13c3919294af4bd5ba7244cf78fdc0823b08
---

 Makefile.am     |  281 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac    |    2 +-
 src/Makefile.am |  271 -----------------------------------------------------
 3 files changed, 276 insertions(+), 278 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commitdiff;h=a3fe13c3919294af4bd5ba7244cf78fdc0823b08