diff options
56 files changed, 70 insertions, 8 deletions
diff --git a/camlibs/adc65/Makefile.am b/camlibs/adc65/Makefile.am index 828d5c426..76bb7ccf0 100644 --- a/camlibs/adc65/Makefile.am +++ b/camlibs/adc65/Makefile.am @@ -4,4 +4,5 @@ EXTRA_DIST = README TODO Changelog adc65_la_SOURCES = adc65.c adc65.h library.c adc65_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +adc65_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym adc65_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/agfa-cl20/Makefile.am b/camlibs/agfa-cl20/Makefile.am index c026c613a..f7dddda8d 100644 --- a/camlibs/agfa-cl20/Makefile.am +++ b/camlibs/agfa-cl20/Makefile.am @@ -6,4 +6,5 @@ EXTRA_DIST = README STATUS ChangeLog protocol.txt protocol2.txt commands.txt \ agfa_cl20_la_SOURCES = agfa_cl20.c agfa_cl20_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +agfa_cl20_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym agfa_cl20_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/aox/Makefile.am b/camlibs/aox/Makefile.am index 273dd74ae..c9c9322ee 100644 --- a/camlibs/aox/Makefile.am +++ b/camlibs/aox/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = aox.la aox_la_SOURCES = library.c aox.c aox.h aox_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +aox_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym aox_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am index 1a667c1e5..6fa96287b 100644 --- a/camlibs/barbie/Makefile.am +++ b/camlibs/barbie/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = barbie.la barbie_la_SOURCES = barbie.c barbie.h library.c library.h barbie_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +barbie_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym barbie_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am index b4dee09b6..6f54cd511 100644 --- a/camlibs/canon/Makefile.am +++ b/camlibs/canon/Makefile.am @@ -27,6 +27,7 @@ canon_la_SOURCES = \ canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) canon_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +canon_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am index 2286f73d9..846a2ec70 100644 --- a/camlibs/casio/Makefile.am +++ b/camlibs/casio/Makefile.am @@ -10,4 +10,5 @@ casio_qv_la_SOURCES = \ casio_qv_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +casio_qv_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym casio_qv_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/digigr8/Makefile.am b/camlibs/digigr8/Makefile.am index 5cf149dba..150f71f40 100644 --- a/camlibs/digigr8/Makefile.am +++ b/camlibs/digigr8/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = digigr8.la digigr8_la_SOURCES = library.c digigr8.c digigr8.h digi_postprocess.c digigr8_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +digigr8_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym digigr8_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am index 07318ec1e..1d1215f11 100644 --- a/camlibs/digita/Makefile.am +++ b/camlibs/digita/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = digita.la digita_la_SOURCES = digita.c serial.c usb.c commands.c digita.h digita_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +digita_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym digita_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am index 8d801f8c5..a65f9abde 100644 --- a/camlibs/dimera/Makefile.am +++ b/camlibs/dimera/Makefile.am @@ -9,4 +9,5 @@ dimera3500_la_SOURCES =\ dimera3500_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +dimera3500_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym dimera3500_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am index 7c4feba3a..6ed01680b 100644 --- a/camlibs/directory/Makefile.am +++ b/camlibs/directory/Makefile.am @@ -6,4 +6,5 @@ directory_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) $(LIBEXIF_CFLAGS) directory_la_SOURCES = directory.c directory_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +directory_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym directory_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/enigma13/Makefile.am b/camlibs/enigma13/Makefile.am index 6a1b08c19..79a76f488 100644 --- a/camlibs/enigma13/Makefile.am +++ b/camlibs/enigma13/Makefile.am @@ -5,4 +5,5 @@ EXTRA_DIST = STATUS protocol.txt enigma13_la_SOURCES = enigma13.c enigma13_la_LDFLAGS = = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +enigma13_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym enigma13_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/fuji/Makefile.am b/camlibs/fuji/Makefile.am index 40739490e..06d1213bb 100644 --- a/camlibs/fuji/Makefile.am +++ b/camlibs/fuji/Makefile.am @@ -5,4 +5,5 @@ EXTRA_DIST = PROTOCOL fuji_la_SOURCES = library.c fuji.c fuji.h fuji_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +fuji_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym fuji_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/gsmart300/Makefile.am b/camlibs/gsmart300/Makefile.am index 1b366a4e6..228e00309 100644 --- a/camlibs/gsmart300/Makefile.am +++ b/camlibs/gsmart300/Makefile.am @@ -4,4 +4,5 @@ gsmart300_la_SOURCES = gsmart300.c gsmart300.h library.c \ gsmart300-jpeg-header.h gsmart300_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +gsmart300_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym gsmart300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/hp215/Makefile.am b/camlibs/hp215/Makefile.am index 8a8578aa0..e5da81926 100644 --- a/camlibs/hp215/Makefile.am +++ b/camlibs/hp215/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = hp215.la hp215_la_SOURCES = hp215.c hp215.h crctab.h hp215_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +hp215_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym hp215_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/iclick/Makefile.am b/camlibs/iclick/Makefile.am index 3ffa09821..92f66afd3 100644 --- a/camlibs/iclick/Makefile.am +++ b/camlibs/iclick/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = iclick.la iclick_la_SOURCES = library.c iclick.c iclick.h iclick_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +iclick_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym iclick_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am index 1aa397c68..17f7863d6 100644 --- a/camlibs/jamcam/Makefile.am +++ b/camlibs/jamcam/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = jamcam.la jamcam_la_SOURCES = jamcam.c library.c library.h jamcam_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +jamcam_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym jamcam_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am index b8c4c8592..9d5ec1e87 100644 --- a/camlibs/jd11/Makefile.am +++ b/camlibs/jd11/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = jd11.la jd11_la_SOURCES = jd11.c serial.h serial.c decomp.h decomp.c jd11_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +jd11_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym jd11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am index e52cfb221..e75843346 100644 --- a/camlibs/kodak/dc120/Makefile.am +++ b/camlibs/kodak/dc120/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = kodak_dc120.la kodak_dc120_la_SOURCES = dc120.c dc120.h library.c library.h kodak_dc120_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +kodak_dc120_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym kodak_dc120_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am index fa58cbf1d..1e0b6a923 100644 --- a/camlibs/kodak/dc210/Makefile.am +++ b/camlibs/kodak/dc210/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = kodak_dc210.la kodak_dc210_la_SOURCES = dc210.c dc210.h library.c library.h kodak_dc210_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +kodak_dc210_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym kodak_dc210_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am index 22f188e43..3b9d8b591 100644 --- a/camlibs/kodak/dc240/Makefile.am +++ b/camlibs/kodak/dc240/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = kodak_dc240.la kodak_dc240_la_SOURCES = dc240.c dc240.h library.c library.h kodak_dc240_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +kodak_dc240_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym kodak_dc240_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am index 984dadc96..4416f0c65 100644 --- a/camlibs/kodak/dc3200/Makefile.am +++ b/camlibs/kodak/dc3200/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = kodak_dc3200.la kodak_dc3200_la_SOURCES = dc3200.c dc3200.h library.c library.h kodak_dc3200_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +kodak_dc3200_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym kodak_dc3200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/ez200/Makefile.am b/camlibs/kodak/ez200/Makefile.am index db8cf685f..4e635a0fe 100644 --- a/camlibs/kodak/ez200/Makefile.am +++ b/camlibs/kodak/ez200/Makefile.am @@ -5,4 +5,5 @@ EXTRA_DIST = Protocol.txt kodak_ez200_la_SOURCES = library.c ez200.c ez200.h kodak_ez200_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +kodak_ez200_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym kodak_ez200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am index 47ccee2d4..825e31af3 100644 --- a/camlibs/konica/Makefile.am +++ b/camlibs/konica/Makefile.am @@ -14,9 +14,11 @@ konica_la_SOURCES = \ konica_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +konica_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym konica_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la konica_qm150_la_SOURCES = qm150.c konica_qm150_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +konica_qm150_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym konica_qm150_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/largan/lmini/Makefile.am b/camlibs/largan/lmini/Makefile.am index 627a62560..9d0d33ad9 100644 --- a/camlibs/largan/lmini/Makefile.am +++ b/camlibs/largan/lmini/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = largan.la largan_la_SOURCES = largan.c lmini.c lmini_ccd.c lmini.h lmini_ccd.h largan_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +largan_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym largan_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/lg_gsm/Makefile.am b/camlibs/lg_gsm/Makefile.am index 137e815b2..e149721c7 100644 --- a/camlibs/lg_gsm/Makefile.am +++ b/camlibs/lg_gsm/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = lg_gsm.la lg_gsm_la_SOURCES = library.c lg_gsm.c lg_gsm.h lg_gsm_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +lg_gsm_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym lg_gsm_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/mars/Makefile.am b/camlibs/mars/Makefile.am index 06b344785..e2d71fe12 100644 --- a/camlibs/mars/Makefile.am +++ b/camlibs/mars/Makefile.am @@ -5,4 +5,5 @@ EXTRA_DIST = protocol.txt mars_la_SOURCES = library.c mars.c mars.h mars_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +mars_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym mars_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am index 32cdc37dd..92d29aca9 100644 --- a/camlibs/minolta/dimagev/Makefile.am +++ b/camlibs/minolta/dimagev/Makefile.am @@ -6,4 +6,5 @@ dimagev_la_SOURCES = capture.c data.c delete.c dimagev.c dimagev.h \ download.c info.c packet.c status.c upload.c util.c dimagev_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +dimagev_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym dimagev_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/mustek/Makefile.am b/camlibs/mustek/Makefile.am index 17b8ed46f..f1e9b7a84 100644 --- a/camlibs/mustek/Makefile.am +++ b/camlibs/mustek/Makefile.am @@ -7,4 +7,5 @@ mustek_la_SOURCES = mdc800.c core.c image.c \ io.h mdc800_spec.h print.h rs232.h usb.h mustek_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +mustek_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym mustek_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am index 6bfd0c11d..9929de977 100644 --- a/camlibs/panasonic/Makefile.am +++ b/camlibs/panasonic/Makefile.am @@ -9,9 +9,11 @@ camlib_LTLIBRARIES =\ panasonic_dc1000_la_SOURCES = dc1000.c dc1000.h dc.c dc.h panasonic_dc1000_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +panasonic_dc1000_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym panasonic_dc1000_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la panasonic_dc1580_la_SOURCES = dc1580.c dc1580.h dc.c dc.h dc1000.h panasonic_dc1580_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +panasonic_dc1580_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym panasonic_dc1580_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am index f85114d96..ac426785c 100644 --- a/camlibs/panasonic/coolshot/Makefile.am +++ b/camlibs/panasonic/coolshot/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = panasonic_coolshot.la panasonic_coolshot_la_SOURCES = coolshot.c library.c library.h panasonic_coolshot_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +panasonic_coolshot_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym panasonic_coolshot_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am index e917bd110..01d964633 100644 --- a/camlibs/panasonic/l859/Makefile.am +++ b/camlibs/panasonic/l859/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = panasonic_l859.la panasonic_l859_la_SOURCES = l859.c l859.h panasonic_l859_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +panasonic_l859_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym panasonic_l859_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/pccam300/Makefile.am b/camlibs/pccam300/Makefile.am index 8051a469d..82eb2f8dc 100644 --- a/camlibs/pccam300/Makefile.am +++ b/camlibs/pccam300/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = pccam300.la pccam300_la_SOURCES = pccam300.c pccam300.h library.c pccam300_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +pccam300_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym pccam300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/pccam600/Makefile.am b/camlibs/pccam600/Makefile.am index 6275c46fd..89724457b 100644 --- a/camlibs/pccam600/Makefile.am +++ b/camlibs/pccam600/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = pccam600.la pccam600_la_SOURCES = pccam600.c pccam600.h library.c pccam600_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +pccam600_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym pccam600_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am index fdca3d8be..0797961e7 100644 --- a/camlibs/polaroid/Makefile.am +++ b/camlibs/polaroid/Makefile.am @@ -9,6 +9,7 @@ camlib_LTLIBRARIES = \ polaroid_pdc320_la_SOURCES = pdc320.c pdc320.h polaroid_pdc320_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +polaroid_pdc320_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym polaroid_pdc320_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la @@ -16,10 +17,12 @@ polaroid_pdc640_la_SOURCES = pdc640.c jd350e.h jd350e.c \ jd350e_red.h jd350e_blue.h dlink350f.c dlink350f.h polaroid_pdc640_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +polaroid_pdc640_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym polaroid_pdc640_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la polaroid_pdc700_la_SOURCES = pdc700.c polaroid_pdc700_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +polaroid_pdc700_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym polaroid_pdc700_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/ptp2/Makefile.am b/camlibs/ptp2/Makefile.am index 44173290e..8123b8069 100644 --- a/camlibs/ptp2/Makefile.am +++ b/camlibs/ptp2/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = ptp2.la ptp2_la_SOURCES = ptp.c ptp.h library.c ptp-bugs.h ptp2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +ptp2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym ptp2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am index 600582108..13321697d 100644 --- a/camlibs/ricoh/Makefile.am +++ b/camlibs/ricoh/Makefile.am @@ -5,9 +5,11 @@ EXTRA_DIST = g3.txt ricoh_la_SOURCES = library.c ricoh.c ricoh.h crctab.h ricoh_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +ricoh_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym ricoh_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la ricoh_g3_la_SOURCES = g3.c ricoh_g3_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +ricoh_g3_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym ricoh_g3_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am index 93896f933..487880f18 100644 --- a/camlibs/samsung/Makefile.am +++ b/camlibs/samsung/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = samsung.la samsung_la_SOURCES = samsung.c samsung_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +samsung_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym samsung_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am index bb654cf0a..22f16c473 100644 --- a/camlibs/sierra/Makefile.am +++ b/camlibs/sierra/Makefile.am @@ -11,4 +11,5 @@ sierra_la_SOURCES =\ nikon-desc.c olympus-desc.c epson-desc.c sierra_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sierra_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS) diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am index 3e3e644e3..103774e08 100644 --- a/camlibs/sipix/Makefile.am +++ b/camlibs/sipix/Makefile.am @@ -9,16 +9,19 @@ EXTRA_DIST = web2.html blink.txt xjpeg.c blink2.txt sipix_blink_la_SOURCES = blink.c sipix_blink_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sipix_blink_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sipix_blink_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la sipix_blink2_la_SOURCES = blink2.c sipix_blink2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sipix_blink2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sipix_blink2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la @LIBJPEG@ sipix_web2_la_SOURCES = web2.c sipix_web2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sipix_web2_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sipix_web2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/smal/Makefile.am b/camlibs/smal/Makefile.am index 9849f52b1..78e294842 100644 --- a/camlibs/smal/Makefile.am +++ b/camlibs/smal/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = smal.la smal_la_SOURCES = smal.c ultrapocket.c smal.h ultrapocket.h smal_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +smal_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym smal_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sonix/Makefile.am b/camlibs/sonix/Makefile.am index b4bc7bf9f..0c9c28137 100644 --- a/camlibs/sonix/Makefile.am +++ b/camlibs/sonix/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = sonix.la sonix_la_SOURCES = library.c sonix.c sonix.h sonix_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sonix_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sonix_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am index 1421d8801..c0de25187 100644 --- a/camlibs/sonydscf1/Makefile.am +++ b/camlibs/sonydscf1/Makefile.am @@ -8,4 +8,5 @@ sony_dscf1_la_SOURCES = \ command.h getuint.h chotplay.h pmp.h common.h sony_dscf1_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sony_dscf1_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sonydscf55/Makefile.am b/camlibs/sonydscf55/Makefile.am index 73295d6ae..a018d5bcb 100644 --- a/camlibs/sonydscf55/Makefile.am +++ b/camlibs/sonydscf55/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = sony_dscf55.la sony_dscf55_la_SOURCES = sony.c sony.h camera.c nls.h sony_dscf55_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sony_dscf55_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sony_dscf55_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/soundvision/Makefile.am b/camlibs/soundvision/Makefile.am index f8af230ac..104d00844 100644 --- a/camlibs/soundvision/Makefile.am +++ b/camlibs/soundvision/Makefile.am @@ -4,4 +4,5 @@ soundvision_la_SOURCES = soundvision.c agfa_cl18.c \ tiger_fastflicks.c commands.c commands.h soundvision.h soundvision_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +soundvision_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym soundvision_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/spca50x/Makefile.am b/camlibs/spca50x/Makefile.am index 4d49f4239..6359d18f4 100644 --- a/camlibs/spca50x/Makefile.am +++ b/camlibs/spca50x/Makefile.am @@ -10,4 +10,5 @@ spca50x_la_SOURCES = spca50x.c spca50x.h \ spca50x-avi-header.h spca50x_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +spca50x_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym spca50x_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sq905/Makefile.am b/camlibs/sq905/Makefile.am index 762578753..7236dcb2f 100644 --- a/camlibs/sq905/Makefile.am +++ b/camlibs/sq905/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = sq905.la sq905_la_SOURCES = library.c sq905.c sq905.h postprocess.c sq905_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sq905_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sq905_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/stv0674/Makefile.am b/camlibs/stv0674/Makefile.am index 22eebf6d6..3dd56dd5f 100644 --- a/camlibs/stv0674/Makefile.am +++ b/camlibs/stv0674/Makefile.am @@ -5,4 +5,5 @@ camlib_LTLIBRARIES = stv0674.la stv0674_la_SOURCES = stv0674.c stv0674.h library.c library.h stv0674_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +stv0674_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym stv0674_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am index 0d3f10603..ffc8263a0 100644 --- a/camlibs/stv0680/Makefile.am +++ b/camlibs/stv0680/Makefile.am @@ -9,4 +9,5 @@ stv0680_la_SOURCES = stv0680.c stv0680.h library.c library.h \ stv0680_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +stv0680_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym stv0680_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sx330z/Makefile.am b/camlibs/sx330z/Makefile.am index 7c3b3ee21..23e8eec8c 100644 --- a/camlibs/sx330z/Makefile.am +++ b/camlibs/sx330z/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = sx330z.la sx330z_la_SOURCES = library.c sx330z.c sx330z.h sx330z_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +sx330z_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym sx330z_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am index 30374e1ea..ac35a156d 100644 --- a/camlibs/template/Makefile.am +++ b/camlibs/template/Makefile.am @@ -7,4 +7,5 @@ noinst_LTLIBRARIES = template.la template_la_SOURCES = template.c template_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +template_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym template_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/toshiba/pdrm11/Makefile.am b/camlibs/toshiba/pdrm11/Makefile.am index 72b028e2d..bde841987 100644 --- a/camlibs/toshiba/pdrm11/Makefile.am +++ b/camlibs/toshiba/pdrm11/Makefile.am @@ -3,4 +3,5 @@ camlib_LTLIBRARIES = toshiba_pdrm11.la toshiba_pdrm11_la_SOURCES = library.c pdrm11.c pdrm11.h toshiba_pdrm11_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym +toshiba_pdrm11_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym toshiba_pdrm11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index b8f14800a..cad2e10f3 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -1,10 +1,5 @@ lib_LTLIBRARIES = libgphoto2.la -libgphoto2_la_CPPFLAGS = \ - $(LTDLINCL) \ - $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(LIBEXIF_CFLAGS) - # Notes about the list of exported symbols: # gp_* also contains internal symbols which are intended for # INTERNAL USE ONLY and should be converted into gpi_* symbols @@ -16,11 +11,16 @@ libgphoto2_la_CPPFLAGS = \ # # Yes, this is messy, but we are going to clean this up. +libgphoto2_la_CPPFLAGS = \ + $(LTDLINCL) \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(LIBEXIF_CFLAGS) + libgphoto2_la_LDFLAGS = \ -no-undefined \ -export-symbols $(srcdir)/libgphoto2.sym \ -version-info @LIBGPHOTO2_VERSION_INFO@ - + libgphoto2_la_SOURCES = \ gphoto2-abilities-list.c\ bayer.c bayer.h \ @@ -49,9 +49,9 @@ libgphoto2_la_LIBADD = \ # "-dlopen" $(top_builddir)/camlibs/ptp2/....la libgphoto2_la_DEPENDENCIES = \ + $(srcdir)/libgphoto2.sym \ $(LIBLTDL) - libgphoto2includedir = $(includedir)/gphoto2 libgphoto2include_HEADERS = \ gphoto2.h \ diff --git a/libgphoto2_port/disk/Makefile.am b/libgphoto2_port/disk/Makefile.am index 9d24285cd..a7b0ebf00 100644 --- a/libgphoto2_port/disk/Makefile.am +++ b/libgphoto2_port/disk/Makefile.am @@ -8,6 +8,7 @@ disk_la_LDFLAGS = -module -no-undefined -avoid-version \ disk_la_CPPFLAGS = \ -I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) $(HAL_CFLAGS) +disk_la_DEPENDENCIES = $(top_srcdir)/iolib.sym disk_la_LIBADD = \ $(top_builddir)/libgphoto2_port/libgphoto2_port.la \ $(HAL_LIBS) diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index 83ed037ae..248e56862 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -47,7 +47,8 @@ libgphoto2_port_la_SOURCES = \ gphoto2-port-result.c libgphoto2_port_la_DEPENDENCIES = \ - $(LIBLTDL) + $(LIBLTDL) \ + $(srcdir)/libgphoto2_port.sym # ship headers libgphoto2_portincludedir = $(includedir)/gphoto2 diff --git a/libgphoto2_port/serial/Makefile.am b/libgphoto2_port/serial/Makefile.am index 858d0d9ff..e907d8114 100644 --- a/libgphoto2_port/serial/Makefile.am +++ b/libgphoto2_port/serial/Makefile.am @@ -7,6 +7,7 @@ serial_la_LDFLAGS = -module -no-undefined -avoid-version \ -export-dynamic \ -export-symbols $(top_srcdir)/iolib.sym serial_la_CPPFLAGS = -I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) +serial_la_DEPENDENCIES = $(top_srcdir)/iolib.sym serial_la_LIBADD = \ $(top_builddir)/libgphoto2_port/libgphoto2_port.la \ $(SERIAL_LIBS) diff --git a/libgphoto2_port/usb/Makefile.am b/libgphoto2_port/usb/Makefile.am index 689ebc693..9685685a0 100644 --- a/libgphoto2_port/usb/Makefile.am +++ b/libgphoto2_port/usb/Makefile.am @@ -8,6 +8,7 @@ usb_la_LDFLAGS = -module -no-undefined -avoid-version \ usb_la_CPPFLAGS = \ -I$(top_srcdir)/libgphoto2_port $(INTL_CFLAGS) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) +usb_la_DEPENDENCIES = $(top_srcdir)/iolib.sym usb_la_LIBADD = \ $(LIBUSB_LIBS) \ $(top_builddir)/libgphoto2_port/libgphoto2_port.la |