diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am
index 49243826e..1120eb9e4 100644
--- a/camlibs/barbie/Makefile.am
+++ b/camlibs/barbie/Makefile.am
@@ -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
diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am
index 363de747a..2a92123ec 100644
--- a/camlibs/canon/Makefile.am
+++ b/camlibs/canon/Makefile.am
@@ -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
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index a5f11ffd4..400a1951c 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -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);
 	
diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am
index dd4af586f..981d0e8ed 100644
--- a/camlibs/digita/Makefile.am
+++ b/camlibs/digita/Makefile.am
@@ -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
diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am
index 431c2db47..59a17d0a7 100644
--- a/camlibs/directory/Makefile.am
+++ b/camlibs/directory/Makefile.am
@@ -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
diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am
index 9cbc41789..2aa02cea1 100644
--- a/camlibs/kodak/dc120/Makefile.am
+++ b/camlibs/kodak/dc120/Makefile.am
@@ -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
diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am
index 50fb3f6af..69b3dcbeb 100644
--- a/camlibs/kodak/dc240/Makefile.am
+++ b/camlibs/kodak/dc240/Makefile.am
@@ -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
diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am
index c0de22a78..486baf03a 100644
--- a/camlibs/konica/Makefile.am
+++ b/camlibs/konica/Makefile.am
@@ -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
diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am
index 302480577..aec99b598 100644
--- a/camlibs/minolta/dimagev/Makefile.am
+++ b/camlibs/minolta/dimagev/Makefile.am
@@ -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
diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am
index 441528bca..7dfdc41f1 100644
--- a/camlibs/panasonic/Makefile.am
+++ b/camlibs/panasonic/Makefile.am
@@ -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
diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am
index 9011f01c7..d2b470b0c 100644
--- a/camlibs/sierra/Makefile.am
+++ b/camlibs/sierra/Makefile.am
@@ -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
diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am
index 116635cb5..f7a596ddb 100644
--- a/camlibs/sonydscf1/Makefile.am
+++ b/camlibs/sonydscf1/Makefile.am
@@ -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
diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am
index 98422ab0b..9b7df4c30 100644
--- a/camlibs/stv0680/Makefile.am
+++ b/camlibs/stv0680/Makefile.am
@@ -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
diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am
index 6c43bef92..cd0c64453 100644
--- a/camlibs/template/Makefile.am
+++ b/camlibs/template/Makefile.am
@@ -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