Index: libmpc/branches/r2d/mpcenc/Makefile.am
===================================================================
--- libmpc/branches/r2d/mpcenc/Makefile.am	(revision 226)
+++ libmpc/branches/r2d/mpcenc/Makefile.am	(revision 232)
@@ -1,4 +1,6 @@
 bin_PROGRAMS = mpcenc
 
+common_sources = ../common/crc32.c \
+		../common/huffman-bcl.c
 
 # set the include path found by configure
@@ -9,6 +11,8 @@
 mpcenc_LDFLAGS = $(all_libraries) 
 mpcenc_SOURCES = keyboard.c mpcenc.c pipeopen.c stderr.c tags.c wave_in.c \
-	winmsg.c
-mpcenc_LDADD = $(top_builddir)/libmpcpsy/libmpcpsy.a \
-	$(top_builddir)/libmpcenc/libmpcenc.a $(top_builddir)/common/libcommon.a -lm
+	winmsg.c \
+	$(common_sources)
+mpcenc_LDADD = -lm \
+	$(top_builddir)/libmpcpsy/libmpcpsy.a \
+	$(top_builddir)/libmpcenc/libmpcenc.a
 AM_CFLAGS = -DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0