[patch] Corrected nox11 patch file for libdc1394-1.2.2

libdc1394-1.2.2-nox11.patch (text/plain), 2.22 KB, created by Eric Westbrook on 2010-03-08 20:09:08 UTC

diff -ur old/examples/Makefile.in new/examples/Makefile.in
--- old/examples/Makefile.in	2010-03-08 12:48:43.000000000 -0700
+++ new/examples/Makefile.in	2010-03-08 12:56:04.000000000 -0700
@@ -34,7 +34,7 @@
 host_triplet = @host@
 bin_PROGRAMS = dc1394_vloopback$(EXEEXT)
 noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \
-	dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT)
+	grab_color_image$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,13 +47,7 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_dc1394_multiview_OBJECTS =  \
-	dc1394_multiview-dc1394_multiview.$(OBJEXT)
-dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS)
 am__DEPENDENCIES_1 =
-dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
 dc1394_multiview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dc1394_multiview_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -82,10 +76,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
+SOURCES = $(dc1394_vloopback_SOURCES) \
 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
 	$(grab_partial_image_SOURCES)
-DIST_SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
+DIST_SOURCES = $(dc1394_vloopback_SOURCES) \
 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
 	$(grab_partial_image_SOURCES)
 ETAGS = etags
@@ -212,8 +206,6 @@
 grab_partial_image_SOURCES = grab_partial_image.c
 grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
 dc1394_multiview_CFLAGS = $(X_CFLAGS)
-dc1394_multiview_SOURCES = dc1394_multiview.c
-dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 $(X_LIBS) $(X_PRE_LIBS) -lXv -lXext -lX11 $(X_EXTRA_LIBS)
 dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h
 dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394
 all: all-am