Index: libmpc/branches/r2d/libmpcdec/Makefile.am
===================================================================
--- libmpc/branches/r2d/libmpcdec/Makefile.am	(revision 137)
+++ libmpc/branches/r2d/libmpcdec/Makefile.am	(revision 137)
@@ -0,0 +1,11 @@
+INCLUDES = -I$(top_srcdir)/include
+METASOURCES = AUTO
+lib_LTLIBRARIES = libmpcdec.la
+libmpcdec_la_SOURCES = huffman.c mpc_decoder.c mpc_reader.c \
+	requant.c	streaminfo.c synth_filter.c mpc_bits_reader.c mpc_demux.c
+
+libmpcdec_la_LDFLAGS = -no-undefined -version-info 4:2:1
+
+
+AM_CFLAGS = -DMPC_LITTLE_ENDIAN
+
Index: libmpc/branches/r2d/libmpcdec/huffman.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/huffman.h	(revision 132)
+++ libmpc/branches/r2d/libmpcdec/huffman.h	(revision 137)
@@ -41,5 +41,5 @@
 #endif
 
-#include <mpcdec//mpc_types.h>
+#include <mpc/mpc_types.h>
 
 #ifdef __cplusplus
Index: libmpc/branches/r2d/libmpcdec/math.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/math.h	(revision 132)
+++ libmpc/branches/r2d/libmpcdec/math.h	(revision 137)
@@ -33,5 +33,5 @@
 */
 /// \file math.h
-/// Libmpcdec internal math routines.  
+/// Libmpcdec internal math routines.
 #ifndef _MPCDEC_MATH_H_
 #define _MPCDEC_MATH_H_
@@ -40,5 +40,5 @@
 #endif
 
-#include <mpcdec/mpc_types.h>
+#include <mpc/mpc_types.h>
 
 #ifdef __cplusplus
Index: libmpc/branches/r2d/libmpcdec/requant.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/requant.h	(revision 132)
+++ libmpc/branches/r2d/libmpcdec/requant.h	(revision 137)
@@ -40,5 +40,5 @@
 #endif
 
-#include <mpcdec/mpc_types.h>
+#include <mpc/mpc_types.h>
 
 #ifdef __cplusplus