Attachment #76476 for bug #118161

Lines 17-23 Link Here

(-)libptp2-1.1.0.orig/src/Makefile.am (-1 / +1 lines)
17	else	17	else
18	ptpcam_SOURCES = ptpcam.c ptpcam.h	18	ptpcam_SOURCES = ptpcam.c ptpcam.h
19	endif	19	endif
20	ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@	20	ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
21	ptpcam_DEPENDANCIES = libptp2.la	21	ptpcam_DEPENDANCIES = libptp2.la
22	ptpcam_CFLAGS = @PTPCAM_CFLAGS@	22	ptpcam_CFLAGS = @PTPCAM_CFLAGS@
23	endif	23	endif




# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,




SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@

DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
	$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
	$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

@LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-ptpcam.$(OBJEXT) \
@LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-myusb.$(OBJEXT)
ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles

build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
effective_target = @effective_target@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@

DISTCLEANFILES = libptp-stdint.h libptp-endian.h
@LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
@LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c
@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
@PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
@PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
all: all-am

Return to bug 118161

Lines 1-4 Link Here

(-)libptp2-1.1.0.orig/src/Makefile.in (-8 / +4 lines)
1	# Makefile.in generated by automake 1.9.5 from Makefile.am.	1	# Makefile.in generated by automake 1.9.6 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Lines 16-23 Link Here
16		16
17		17
18		18
19	SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)
20
21	srcdir = @srcdir@	19	srcdir = @srcdir@
22	top_srcdir = @top_srcdir@	20	top_srcdir = @top_srcdir@
23	VPATH = @srcdir@	21	VPATH = @srcdir@
Lines 45-52 Link Here
45	DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \	43	DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
46	$(srcdir)/Makefile.in	44	$(srcdir)/Makefile.in
47	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	45	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
48	am__aclocal_m4_deps = $(top_srcdir)/m4/byteorder.m4 \	46	am__aclocal_m4_deps = $(top_srcdir)/configure.in
49	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
50	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \	47	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
51	$(ACLOCAL_M4)	48	$(ACLOCAL_M4)
52	mkinstalldirs = $(install_sh) -d	49	mkinstalldirs = $(install_sh) -d
Lines 74-80 Link Here
74	@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-ptpcam.$(OBJEXT) \	71	@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-ptpcam.$(OBJEXT) \
75	@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-myusb.$(OBJEXT)	72	@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-myusb.$(OBJEXT)
76	ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)	73	ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
77	ptpcam_DEPENDENCIES =	74	@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
78	DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)	75	DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
79	depcomp = $(SHELL) $(top_srcdir)/depcomp	76	depcomp = $(SHELL) $(top_srcdir)/depcomp
80	am__depfiles_maybe = depfiles	77	am__depfiles_maybe = depfiles
Lines 176-182 Link Here
176	build_os = @build_os@	173	build_os = @build_os@
177	build_vendor = @build_vendor@	174	build_vendor = @build_vendor@
178	datadir = @datadir@	175	datadir = @datadir@
179	effective_target = @effective_target@
180	exec_prefix = @exec_prefix@	176	exec_prefix = @exec_prefix@
181	host = @host@	177	host = @host@
182	host_alias = @host_alias@	178	host_alias = @host_alias@
Lines 207-213 Link Here
207	DISTCLEANFILES = libptp-stdint.h libptp-endian.h	203	DISTCLEANFILES = libptp-stdint.h libptp-endian.h
208	@LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h	204	@LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
209	@LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c	205	@LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c
210	@PTPCAM_TRUE@ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@	206	@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
211	@PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la	207	@PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
212	@PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@	208	@PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
213	all: all-am	209	all: all-am