Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 308485 | Differences between
and this patch

Collapse All | Expand All

(-)old/examples/Makefile.in (-11 / +3 lines)
Lines 34-40 Link Here
34
host_triplet = @host@
34
host_triplet = @host@
35
bin_PROGRAMS = dc1394_vloopback$(EXEEXT)
35
bin_PROGRAMS = dc1394_vloopback$(EXEEXT)
36
noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \
36
noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \
37
	dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT)
37
	grab_color_image$(EXEEXT)
38
subdir = examples
38
subdir = examples
39
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
39
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
40
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Lines 47-59 Link Here
47
am__installdirs = "$(DESTDIR)$(bindir)"
47
am__installdirs = "$(DESTDIR)$(bindir)"
48
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
48
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
49
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
49
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
50
am_dc1394_multiview_OBJECTS =  \
51
	dc1394_multiview-dc1394_multiview.$(OBJEXT)
52
dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS)
53
am__DEPENDENCIES_1 =
50
am__DEPENDENCIES_1 =
54
dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la \
55
	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
56
	$(am__DEPENDENCIES_1)
57
dc1394_multiview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
51
dc1394_multiview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
58
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dc1394_multiview_CFLAGS) \
52
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dc1394_multiview_CFLAGS) \
59
	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
53
	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
Lines 82-91 Link Here
82
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
76
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
83
	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
77
	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
84
	$(LDFLAGS) -o $@
78
	$(LDFLAGS) -o $@
85
SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
79
SOURCES = $(dc1394_vloopback_SOURCES) \
86
	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
80
	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
87
	$(grab_partial_image_SOURCES)
81
	$(grab_partial_image_SOURCES)
88
DIST_SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
82
DIST_SOURCES = $(dc1394_vloopback_SOURCES) \
89
	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
83
	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
90
	$(grab_partial_image_SOURCES)
84
	$(grab_partial_image_SOURCES)
91
ETAGS = etags
85
ETAGS = etags
Lines 212-219 Link Here
212
grab_partial_image_SOURCES = grab_partial_image.c
206
grab_partial_image_SOURCES = grab_partial_image.c
213
grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
207
grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
214
dc1394_multiview_CFLAGS = $(X_CFLAGS)
208
dc1394_multiview_CFLAGS = $(X_CFLAGS)
215
dc1394_multiview_SOURCES = dc1394_multiview.c
216
dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 $(X_LIBS) $(X_PRE_LIBS) -lXv -lXext -lX11 $(X_EXTRA_LIBS)
217
dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h
209
dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h
218
dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394
210
dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394
219
all: all-am
211
all: all-am

Return to bug 308485