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