[c5c522c] | 1 | diff -ruN libdc1394-1.2.1.orig/examples/Makefile.in libdc1394-1.2.1/examples/Makefile.in |
---|
| 2 | --- libdc1394-1.2.1.orig/examples/Makefile.in 2006-03-31 06:53:44.000000000 +0200 |
---|
| 3 | +++ libdc1394-1.2.1/examples/Makefile.in 2006-05-07 09:59:31.000000000 +0200 |
---|
| 4 | @@ -38,7 +38,7 @@ |
---|
| 5 | host_triplet = @host@ |
---|
| 6 | bin_PROGRAMS = dc1394_vloopback$(EXEEXT) |
---|
| 7 | noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \ |
---|
| 8 | - dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT) |
---|
| 9 | + grab_color_image$(EXEEXT) |
---|
| 10 | subdir = examples |
---|
| 11 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
---|
| 12 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
---|
| 13 | @@ -51,13 +51,7 @@ |
---|
| 14 | am__installdirs = "$(DESTDIR)$(bindir)" |
---|
| 15 | binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) |
---|
| 16 | PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) |
---|
| 17 | -am_dc1394_multiview_OBJECTS = \ |
---|
| 18 | - dc1394_multiview-dc1394_multiview.$(OBJEXT) |
---|
| 19 | -dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS) |
---|
| 20 | am__DEPENDENCIES_1 = |
---|
| 21 | -dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la \ |
---|
| 22 | - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ |
---|
| 23 | - $(am__DEPENDENCIES_1) |
---|
| 24 | am_dc1394_vloopback_OBJECTS = dc1394_vloopback.$(OBJEXT) \ |
---|
| 25 | affine.$(OBJEXT) |
---|
| 26 | dc1394_vloopback_OBJECTS = $(am_dc1394_vloopback_OBJECTS) |
---|
| 27 | @@ -82,10 +76,10 @@ |
---|
| 28 | CCLD = $(CC) |
---|
| 29 | LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
---|
| 30 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
---|
| 31 | -SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \ |
---|
| 32 | +SOURCES = $(dc1394_vloopback_SOURCES) \ |
---|
| 33 | $(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \ |
---|
| 34 | $(grab_partial_image_SOURCES) |
---|
| 35 | -DIST_SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \ |
---|
| 36 | +DIST_SOURCES = $(dc1394_vloopback_SOURCES) \ |
---|
| 37 | $(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \ |
---|
| 38 | $(grab_partial_image_SOURCES) |
---|
| 39 | ETAGS = etags |
---|
| 40 | @@ -202,8 +196,6 @@ |
---|
| 41 | grab_partial_image_SOURCES = grab_partial_image.c |
---|
| 42 | grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 |
---|
| 43 | dc1394_multiview_CFLAGS = $(X_CFLAGS) |
---|
| 44 | -dc1394_multiview_SOURCES = dc1394_multiview.c |
---|
| 45 | -dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 $(X_LIBS) $(X_PRE_LIBS) -lXv -lXext -lX11 $(X_EXTRA_LIBS) |
---|
| 46 | dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h |
---|
| 47 | dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394 |
---|
| 48 | all: all-am |
---|
| 49 | @@ -276,7 +268,7 @@ |
---|
| 50 | done |
---|
| 51 | dc1394_multiview$(EXEEXT): $(dc1394_multiview_OBJECTS) $(dc1394_multiview_DEPENDENCIES) |
---|
| 52 | @rm -f dc1394_multiview$(EXEEXT) |
---|
| 53 | - $(LINK) $(dc1394_multiview_LDFLAGS) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS) |
---|
| 54 | + $(LINK) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS) |
---|
| 55 | dc1394_vloopback$(EXEEXT): $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_DEPENDENCIES) |
---|
| 56 | @rm -f dc1394_vloopback$(EXEEXT) |
---|
| 57 | $(LINK) $(dc1394_vloopback_LDFLAGS) $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_LDADD) $(LIBS) |
---|