Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.32
diff -u -3 -p -r1.32 Makefile.am
--- Makefile.am	1 Aug 2006 16:57:35 -0000	1.32
+++ Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -56,8 +56,7 @@ endif
 
 SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
 
-# libamf isn't used yet, but we still want it in the distribution
-DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite plugin
 
 #EXTRA_DIST = macros
 # if HTTP
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.30
diff -u -3 -p -r1.30 Makefile.am
--- backend/Makefile.am	31 Jul 2006 21:49:43 -0000	1.30
+++ backend/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -102,6 +102,10 @@ libgnashbackend_la_SOURCES = \
 	$(RENDER_SOURCES) \
 	$(SOUND_SOURCES)
 
+libgnashbackend_la_LIBADD = \
+	../libbase/libgnashbase.la \
+	../server/libgnashserver.la 
+
 # gnash_SOURCES = gnash.cpp
 # gnash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
 # gnash_LDADD =  $(AM_LDFLAGS) \
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.12
diff -u -3 -p -r1.12 Makefile.am
--- gui/Makefile.am	1 Aug 2006 23:12:48 -0000	1.12
+++ gui/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -152,7 +152,7 @@ libgnashgui_la_SOURCES = \
 
 libgnashgui_la_LIBADD = \
 	../server/libgnashserver.la \
-	../libamf/libgnashamf.la
+	../backend/libgnashbackend.la
 
 if USE_GUI_KDE
 bin_PROGRAMS = gnash klash
@@ -183,7 +183,7 @@ klash_LDADD = \
 	$(LIB_KDEUI) \
 	$(GNASH_LIBS)
 
-klash_DEPENDANCIES = klash.moc libgnashgui.la
+klash_DEPENDENCIES = klash.moc libgnashgui.la
 
 CLEANFILES = klash.moc
 klash.moc: $(srcdir)/kdesup.h
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.9
diff -u -3 -p -r1.9 Makefile.am
--- libamf/Makefile.am	2 Aug 2006 01:34:10 -0000	1.9
+++ libamf/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -63,11 +63,12 @@ libgnashamf_la_SOURCES = amf.cpp rtmp.cp
 INCLUDES = -I.. -I$(srcdir) \
 	-I$(top_srcdir)/server \
 	-I$(top_srcdir)/libbase \
-        $(LIBXML_CFLAGS)
+	$(LIBXML_CFLAGS)
 
 # noinst_PROGRAMS = amftest
-noinst_HEADERS = amfutf8.h amf.h rtmp.h
+noinst_HEADERS = amfutf8.h amf.h rtmp.h protocol.h
 
+check_PROGRAMS = amftest
 amftest_SOURCES = amftest.cpp
 amftest_LDADD = $(AM_LDFLAGS) libgnashamf.la
 
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.33
diff -u -3 -p -r1.33 Makefile.am
--- libbase/Makefile.am	30 Jul 2006 15:54:00 -0000	1.33
+++ libbase/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -103,7 +103,7 @@ libgnashbase_la_LIBADD = \
 	$(JPEG_LIBS) \
 	$(ZLIB_LIBS) \
 	$(CURL_LIBS) \
-	$(SDL_LIBS)
+	$(SDL_LIBS) 
 #	$(OPENGL_LIBS)
 
 noinst_HEADERS = \
@@ -117,6 +117,7 @@ noinst_HEADERS = \
 	membuf.h \
 	network.h \
 	log.h \
+	ogl.h \
 	postscript.h \
 	rc.h \
 	smart_ptr.h \
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.55
diff -u -3 -p -r1.55 Makefile.am
--- server/Makefile.am	9 Aug 2006 01:59:06 -0000	1.55
+++ server/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -183,6 +183,8 @@ noinst_HEADERS = \
 	fn_call.h
 
 libgnashserver_la_LIBADD = \
+	../libbase/libgnashbase.la \
+	asobj/libgnashasobjs.la \
 	$(ZLIB_LIBS) \
 	$(LIBXML_LIBS) \
 	$(LIBXML_LIBS) \
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- server/asobj/Makefile.am	9 Aug 2006 01:59:07 -0000	1.3
+++ server/asobj/Makefile.am	11 Aug 2006 10:43:49 -0000
@@ -116,6 +116,10 @@ noinst_HEADERS = \
 	TextSnapshot.h	\
 	Video.h
 
+libgnashasobjs_la_LIBADD = \
+	../../libamf/libgnashamf.la \
+	../../libbase/libgnashbase.la
+
 # Rebuild with GCC 4.x Mudflap support
 mudflap:
 	@echo "Rebuilding with GCC Mudflap support"