Index: libavc1394-0.5.4/Makefile.am
===================================================================
--- libavc1394-0.5.4.orig/Makefile.am
+++ libavc1394-0.5.4/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common libavc1394 librom1394 test
+SUBDIRS = common librom1394 libavc1394 test
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
 	stamp-h.in
 EXTRA_DIST = libavc1394.pc libavc1394.spec
Index: libavc1394-0.5.3/Makefile.in
===================================================================
--- libavc1394-0.5.4.orig/Makefile.in
+++ libavc1394-0.5.4/Makefile.in
@@ -245,7 +245,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = common libavc1394 librom1394 test
+SUBDIRS = common librom1394 libavc1394 test
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
 	stamp-h.in
 
Index: libavc1394-0.5.3/libavc1394/Makefile.am
===================================================================
--- libavc1394-0.5.3.orig/libavc1394/Makefile.am
+++ libavc1394-0.5.3/libavc1394/Makefile.am
@@ -1,11 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 lib_LTLIBRARIES = libavc1394.la
 libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
-	-version-info @lt_major@:@lt_revision@:@lt_age@ 
-libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo 
+	-version-info @lt_major@:@lt_revision@:@lt_age@
+#libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
 libavc1394_la_SOURCES = \
 	avc1394_simple.c avc1394_vcr.c \
-	avc1394_internal.c avc1394_internal.h 
+	avc1394_internal.c avc1394_internal.h
 pkginclude_HEADERS = avc1394.h avc1394_vcr.h
 INCLUDES = @LIBRAW1394_CFLAGS@
 
Index: libavc1394-0.5.4/libavc1394/Makefile.in
===================================================================
--- libavc1394-0.5.4.orig/libavc1394/Makefile.in
+++ libavc1394-0.5.4/libavc1394/Makefile.in
@@ -216,12 +216,12 @@ target_alias = @target_alias@
 MAINTAINERCLEANFILES = Makefile.in
 lib_LTLIBRARIES = libavc1394.la
 libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
-	-version-info @lt_major@:@lt_revision@:@lt_age@ 
+	-version-info @lt_major@:@lt_revision@:@lt_age@
 
-libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo 
+libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
 libavc1394_la_SOURCES = \
 	avc1394_simple.c avc1394_vcr.c \
-	avc1394_internal.c avc1394_internal.h 
+	avc1394_internal.c avc1394_internal.h
 
 pkginclude_HEADERS = avc1394.h avc1394_vcr.h
 INCLUDES = @LIBRAW1394_CFLAGS@
Index: libavc1394-0.5.4/librom1394/Makefile.am
===================================================================
--- libavc1394-0.5.4.orig/librom1394/Makefile.am
+++ libavc1394-0.5.4/librom1394/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 lib_LTLIBRARIES = librom1394.la
 librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
-	-version-info @lt_major@:@lt_revision@:@lt_age@  -lm
+	-version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
 librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
 librom1394_la_SOURCES = \
 	rom1394_main.c \
Index: libavc1394-0.5.3/librom1394/Makefile.in
===================================================================
--- libavc1394-0.5.4.orig/librom1394/Makefile.in
+++ libavc1394-0.5.4/librom1394/Makefile.in
@@ -215,7 +215,7 @@ target_alias = @target_alias@
 MAINTAINERCLEANFILES = Makefile.in
 lib_LTLIBRARIES = librom1394.la
 librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
-	-version-info @lt_major@:@lt_revision@:@lt_age@  -lm
+	-version-info @lt_major@:@lt_revision@:@lt_age@  -lm -lraw1394
 
 librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
 librom1394_la_SOURCES = \