diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am index ce1ae15eb..eddc5cd88 100644 --- a/camlibs/barbie/Makefile.am +++ b/camlibs/barbie/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = barbie.df makefile.os2 main.c compile -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_barbie.la INCLUDES = \ diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am index 015da2982..8c845514d 100644 --- a/camlibs/canon/Makefile.am +++ b/camlibs/canon/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = doc EXTRA_DIST = .indent.pro canon.df makefile.os2 Protocol ChangeLog -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_canon.la INCLUDES = \ diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am index 50e9bcf41..5652caf22 100644 --- a/camlibs/casio/Makefile.am +++ b/camlibs/casio/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_casio_qv.la INCLUDES = \ diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am index 93d04f7e1..20f9b97f5 100644 --- a/camlibs/digita/Makefile.am +++ b/camlibs/digita/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = digita.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_digita.la INCLUDES = \ diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am index aeb0d4e3a..489151d97 100644 --- a/camlibs/dimera/Makefile.am +++ b/camlibs/dimera/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = dimera.df makefile.os2 CREDITS Protocol.txt -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_dimera3500.la INCLUDES = \ diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am index 0d4c22c02..8833c92a0 100644 --- a/camlibs/directory/Makefile.am +++ b/camlibs/directory/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = directory.df directory.def makefile.os2 makedll.cmd -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_directory.la INCLUDES = \ diff --git a/camlibs/fuji/Makefile.am b/camlibs/fuji/Makefile.am index c3b1b2908..1a059a378 100644 --- a/camlibs/fuji/Makefile.am +++ b/camlibs/fuji/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_fuji.la INCLUDES = \ diff --git a/camlibs/gsmart/Makefile.am b/camlibs/gsmart/Makefile.am index 3da9fb19d..1d5ee4de5 100644 --- a/camlibs/gsmart/Makefile.am +++ b/camlibs/gsmart/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_gsmart.la INCLUDES = \ diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am index 369c70542..534804715 100644 --- a/camlibs/jamcam/Makefile.am +++ b/camlibs/jamcam/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_jamcam.la INCLUDES = \ diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am index 6e748ac0b..98b89eafc 100644 --- a/camlibs/jd11/Makefile.am +++ b/camlibs/jd11/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = jd11.html -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_jd11.la INCLUDES = \ diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am index 3795fc597..9cc208e74 100644 --- a/camlibs/kodak/dc120/Makefile.am +++ b/camlibs/kodak/dc120/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = kodak.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_kodak_dc120.la INCLUDES = \ diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am index a1ec0e255..260fc64b9 100644 --- a/camlibs/kodak/dc210/Makefile.am +++ b/camlibs/kodak/dc210/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = kodak.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_kodak_dc210.la INCLUDES = \ diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am index 31e5cb06e..b7649100d 100644 --- a/camlibs/kodak/dc240/Makefile.am +++ b/camlibs/kodak/dc240/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = kodak.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_kodak_dc240.la INCLUDES = \ diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am index 95c8ae5e4..6ee43326c 100644 --- a/camlibs/kodak/dc3200/Makefile.am +++ b/camlibs/kodak/dc3200/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = kodak.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_kodak_dc3200.la INCLUDES = \ diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am index 09f540773..19c50fe1b 100644 --- a/camlibs/konica/Makefile.am +++ b/camlibs/konica/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = localization -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_konica.la EXTRA_DIST = EXPERTS konica.df makefile.os2 diff --git a/camlibs/largan/lmini/Makefile.am b/camlibs/largan/lmini/Makefile.am index 57901fce9..bafe79e51 100644 --- a/camlibs/largan/lmini/Makefile.am +++ b/camlibs/largan/lmini/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_largan.la INCLUDES = \ diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am index 23a3d9cf9..2bb7b9ba1 100644 --- a/camlibs/minolta/dimagev/Makefile.am +++ b/camlibs/minolta/dimagev/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = dimagev.df makefile.os2 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_dimagev.la INCLUDES = \ diff --git a/camlibs/mustek/Makefile.am b/camlibs/mustek/Makefile.am index 97966a2d4..2bcc9a614 100644 --- a/camlibs/mustek/Makefile.am +++ b/camlibs/mustek/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_mustek.la INCLUDES = \ diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am index bb5c7cd40..f893035f6 100644 --- a/camlibs/panasonic/Makefile.am +++ b/camlibs/panasonic/Makefile.am @@ -2,7 +2,6 @@ EXTRA_DIST = panasonic.df makefile.os2 dc1000.df dc1580.df SUBDIRS = coolshot l859 -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES =\ libgphoto2_panasonic_dc1000.la\ libgphoto2_panasonic_dc1580.la diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am index 8505bf940..6fa1f82d5 100644 --- a/camlibs/panasonic/coolshot/Makefile.am +++ b/camlibs/panasonic/coolshot/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_panasonic_coolshot.la INCLUDES = \ diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am index 6e3c71ac3..011c9f49f 100644 --- a/camlibs/panasonic/l859/Makefile.am +++ b/camlibs/panasonic/l859/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_panasonic_l859.la INCLUDES = \ diff --git a/camlibs/pccam600/Makefile.am b/camlibs/pccam600/Makefile.am index ec94a47ef..1c69b9e57 100644 --- a/camlibs/pccam600/Makefile.am +++ b/camlibs/pccam600/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_pccam600.la INCLUDES = \ diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am index 993b19e2d..42b2256af 100644 --- a/camlibs/polaroid/Makefile.am +++ b/camlibs/polaroid/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = jpeg.txt jpeghead.h -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = \ libgphoto2_polaroid_pdc320.la \ libgphoto2_polaroid_pdc640.la \ diff --git a/camlibs/ptp/Makefile.am b/camlibs/ptp/Makefile.am index 81cb8f882..4ff752b18 100644 --- a/camlibs/ptp/Makefile.am +++ b/camlibs/ptp/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = README ptp-pack.c test_ptp.c -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_ptp.la INCLUDES = \ diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am index a59b1db48..d229ac83e 100644 --- a/camlibs/ricoh/Makefile.am +++ b/camlibs/ricoh/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_ricoh.la INCLUDES = \ diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am index cb4665661..2b2df8f2f 100644 --- a/camlibs/samsung/Makefile.am +++ b/camlibs/samsung/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_samsung.la INCLUDES = \ diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am index bd13147fe..7af74d739 100644 --- a/camlibs/sierra/Makefile.am +++ b/camlibs/sierra/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = sierra.df makefile.os2 PROTOCOL -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sierra.la INCLUDES = \ diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am index 7b6d7c223..40f2b16b3 100644 --- a/camlibs/sipix/Makefile.am +++ b/camlibs/sipix/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sipix.la EXTRA_DIST = web2.html diff --git a/camlibs/sipixblink/Makefile.am b/camlibs/sipixblink/Makefile.am index 05a065a59..86635049a 100644 --- a/camlibs/sipixblink/Makefile.am +++ b/camlibs/sipixblink/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sipixblink.la INCLUDES = \ diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am index eb8b3a863..aacca84d3 100644 --- a/camlibs/sonydscf1/Makefile.am +++ b/camlibs/sonydscf1/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = sonydscf1.df makefile.os2 readme todo -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sony_dscf1.la INCLUDES = \ diff --git a/camlibs/sonydscf55/Makefile.am b/camlibs/sonydscf55/Makefile.am index 397b446d3..264323a65 100644 --- a/camlibs/sonydscf55/Makefile.am +++ b/camlibs/sonydscf55/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sony_dscf55.la INCLUDES = \ diff --git a/camlibs/soundvision/Makefile.am b/camlibs/soundvision/Makefile.am index 3a661e139..f3d90ab01 100644 --- a/camlibs/soundvision/Makefile.am +++ b/camlibs/soundvision/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_soundvision.la INCLUDES = \ diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am index 652f606b8..8a519f0eb 100644 --- a/camlibs/stv0680/Makefile.am +++ b/camlibs/stv0680/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = stv0680.df makefile.os2 CREDITS LICENCE README.pdf 680_commands_and_communication_sdk.pdf.gz -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_stv0680.la INCLUDES = \ diff --git a/camlibs/sx330z/Makefile.am b/camlibs/sx330z/Makefile.am index 7c424c9da..bed9ee560 100644 --- a/camlibs/sx330z/Makefile.am +++ b/camlibs/sx330z/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_sx330z.la INCLUDES = \ diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am index aaa2723a2..4d6b63622 100644 --- a/camlibs/template/Makefile.am +++ b/camlibs/template/Makefile.am @@ -1,4 +1,3 @@ -camlibdir = $(libdir)/gphoto2/$(VERSION) camlib_LTLIBRARIES = libgphoto2_template.la INCLUDES = \