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