1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
--- libptp2-1.1.10.orig/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100
+++ libptp2-1.1.10/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100
@@ -17,7 +17,7 @@
else
ptpcam_SOURCES = ptpcam.c ptpcam.h
endif
-ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
+ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
ptpcam_DEPENDANCIES = libptp2.la
ptpcam_CFLAGS = @PTPCAM_CFLAGS@
endif
--- libptp2-1.1.10.orig/src/Makefile.in 2007-08-27 01:08:33.000000000 +1000
+++ libptp2-1.1.10/src/Makefile.in 2007-12-28 09:52:05.000000000 +1100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
-SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -45,8 +43,7 @@
DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/byteorder.m4 \
- $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -74,7 +71,7 @@
@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-ptpcam.$(OBJEXT) \
@LINUX_OS_TRUE@@PTPCAM_TRUE@ ptpcam-myusb.$(OBJEXT)
ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
-ptpcam_DEPENDENCIES =
+@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -122,6 +119,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -150,16 +148,14 @@
PTPCAM_LDFLAGS = @PTPCAM_LDFLAGS@
PTPCAM_TRUE = @PTPCAM_TRUE@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -176,24 +172,30 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-effective_target = @effective_target@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -207,7 +209,7 @@
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 = -lptp2 @PTPCAM_LDFLAGS@
+@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
@PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
@PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
all: all-am
|
GitWeb