darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added -lgphoto2 in again (KDE folks need it?). Added -L$(shell pwd)/$(top_builddir)/libgphoto2/.libs - this hopefully fixes the first time installation problem with -lgphoto2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1499 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-01-08 07:09:16 +00:00
parent a84fa8f73a
commit 04eec0f531
14 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlibs/barbie/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_barbie_la_SOURCES = barbie.c barbie.h library.c library.h
libgphoto2_barbie_la_LDFLAGS = -version-info 0:0:0
libgphoto2_barbie_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_barbie_la_LIBADD = -lgphoto2
libgphoto2_barbie_la_LIBADD = -lgphoto2

14
camlibs/canon/Makefile.am
View File

@@ -5,9 +5,15 @@ CFLAGS = @CFLAGS@ `gpio-config --cflags` -g -Wall
LDFLAGS = @LDFLAGS@ -g `gpio-config --libs`
INCLUDES = -I$(top_srcdir)/include
libgphoto2_canon_la_SOURCES = canon.c canon.h psa50.c psa50.h serial.c serial.h \
crc.c crc.h util.c util.h
libgphoto2_canon_la_SOURCES =\
canon.c canon.h\
psa50.c psa50.h\
serial.c serial.h \
crc.c crc.h\
util.c util.h
libgphoto2_canon_la_LDFLAGS = -version-info 0:0:0 -g
libgphoto2_canon_la_LDFLAGS =\
-avoid-version -g\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_canon_la_LIBADD = -lgphoto2
libgphoto2_canon_la_LIBADD = -lgphoto2

11
camlibs/canon/canon.c
View File

@@ -1268,11 +1268,6 @@ int camera_config_get(Camera *camera, CameraWidget **window)
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_config_get()");
if (cs->cached_ready == 1) {
camtime = psa50_get_time(camera);
camtm = gmtime(&camtime);
}
*window = gp_widget_new(GP_WIDGET_WINDOW,
"Canon PowerShot Configuration");
@@ -1288,9 +1283,11 @@ int camera_config_get(Camera *camera, CameraWidget **window)
gp_widget_append(section,t);
t = gp_widget_new(GP_WIDGET_TEXT, "date");
if (cs->cached_ready == 1)
if (cs->cached_ready == 1) {
camtime = psa50_get_time(camera);
camtm = gmtime(&camtime);
gp_widget_value_set (t, asctime(camtm));
else
} else
gp_widget_value_set (t, "Unavailable");
gp_widget_append(section,t);

6
camlibs/digita/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_digita_la_SOURCES = digita.c serial.c usb.c commands.c digita.h
libgphoto2_digita_la_LDFLAGS = -version-info 0:0:0
libgphoto2_digita_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_digita_la_LIBADD = -lgphoto2
libgphoto2_digita_la_LIBADD = -lgphoto2

6
camlibs/directory/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_directory_la_SOURCES = directory.c directory.h
libgphoto2_directory_la_LDFLAGS = -version-info 0:0:0
libgphoto2_directory_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_directory_la_LIBADD = -lgphoto2
libgphoto2_directory_la_LIBADD = -lgphoto2

6
camlibs/kodak/dc120/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_kodak_dc120_la_SOURCES = dc120.c dc120.h library.c library.h
libgphoto2_kodak_dc120_la_LDFLAGS = -version-info 0:0:0
libgphoto2_kodak_dc120_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_kodak_dc120_la_LIBADD = -lgphoto2
libgphoto2_kodak_dc120_la_LIBADD = -lgphoto2

6
camlibs/kodak/dc240/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_kodak_dc240_la_SOURCES = dc240.c dc240.h library.c library.h
libgphoto2_kodak_dc240_la_LDFLAGS = -version-info 0:0:0
libgphoto2_kodak_dc240_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_kodak_dc240_la_LIBADD = -lgphoto2
libgphoto2_kodak_dc240_la_LIBADD = -lgphoto2

12
camlibs/konica/Makefile.am
View File

@@ -7,8 +7,12 @@ EXTRA_DIST = ChangeLog EXPERTS
INCLUDES = -I$(top_srcdir)/include
libgphoto2_konica_la_SOURCES = \
lowlevel.c lowlevel.h \
konica.c konica.h \
library.c library.h
lowlevel.c lowlevel.h \
konica.c konica.h \
library.c library.h
libgphoto2_konica_la_LDFLAGS = -version-info 0:0:0
libgphoto2_konica_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
libgphoto2_konica_la_LIBADD = -lgphoto2

6
camlibs/minolta/dimagev/Makefile.am
View File

@@ -6,6 +6,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_dimagev_la_SOURCES = capture.c data.c delete.c dimagev.c dimagev.h \
download.c info.c packet.c status.c util.c
libgphoto2_dimagev_la_LDFLAGS = -version-info 0:0:0
libgphoto2_dimagev_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_dimagev_la_LIBADD = -lgphoto2
libgphoto2_dimagev_la_LIBADD = -lgphoto2

16
camlibs/panasonic/Makefile.am
View File

@@ -1,16 +1,22 @@
camlibdir = $(prefix)/lib/gphoto2
camlib_LTLIBRARIES = libgphoto2_panasonic_dc1000.la libgphoto2_panasonic_dc1580.la
camlib_LTLIBRARIES =\
libgphoto2_panasonic_dc1000.la\
libgphoto2_panasonic_dc1580.la
INCLUDES = -I$(top_srcdir)/include
libgphoto2_panasonic_dc1000_la_SOURCES = dc1000.c dc1000.h dc.c dc.h
libgphoto2_panasonic_dc1000_la_LDFLAGS = -version-info 0:0:0
libgphoto2_panasonic_dc1000_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_panasonic_dc1000_la_LIBADD = -lgphoto2
libgphoto2_panasonic_dc1000_la_LIBADD = -lgphoto2
libgphoto2_panasonic_dc1580_la_SOURCES = dc1580.c dc1580.h dc.c dc.h dc1000.h
libgphoto2_panasonic_dc1580_la_LDFLAGS = -version-info 0:0:0
libgphoto2_panasonic_dc1580_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_panasonic_dc1580_la_LIBADD = -lgphoto2
libgphoto2_panasonic_dc1580_la_LIBADD = -lgphoto2

6
camlibs/sierra/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_sierra_la_SOURCES = sierra.c sierra.h library.c library.h
libgphoto2_sierra_la_LDFLAGS = -version-info 0:0:0 `gpio-config --libs`
libgphoto2_sierra_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_sierra_la_LIBADD = -lgphoto2
libgphoto2_sierra_la_LIBADD = -lgphoto2

6
camlibs/sonydscf1/Makefile.am
View File

@@ -8,6 +8,8 @@ libgphoto_sony_dscf1_la_SOURCES = tty.c command.c getuint.c \
chotplay.c dsc_f1.c \
tty.h command.h getuint.h chotplay.h pmp.h config.h common.h
libgphoto_sony_dscf1_la_LDFLAGS = -version-info 0:0:0
libgphoto_sony_dscf1_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto_sony_dscf1_la_LIBADD = -lgphoto2
libgphoto_sony_dscf1_la_LIBADD = -lgphoto2

6
camlibs/stv0680/Makefile.am
View File

@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_stv0680_la_SOURCES = stv0680.c stv0680.h library.c library.h bayer.c bayer.h pattrec.c pattrec.h
libgphoto2_stv0680_la_LDFLAGS = -version-info 0:0:0
libgphoto2_stv0680_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
#libgphoto2_stv0680_la_LIBADD = -lgphoto2
libgphoto2_stv0680_la_LIBADD = -lgphoto2

6
camlibs/template/Makefile.am
View File

@@ -5,4 +5,8 @@ INCLUDES = -I$(top_srcdir)/include
libgphoto2_template_la_SOURCES = template.c template.h
libgphoto2_template_la_LDFLAGS = -version-info 0:0:0
libgphoto2_template_la_LDFLAGS =\
-avoid-version\
-L$(shell pwd)/$(top_builddir)/libgphoto2/.libs
libgphoto2_template_la_LIBADD = -lgphoto2