diff options
| author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2005-06-11 17:09:47 +0000 |
|---|---|---|
| committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2005-06-11 17:09:47 +0000 |
| commit | 937c1d705cb40a5b2b69b3bda2397b3d679e3048 (patch) | |
| tree | 3f858c2630f8d1a6a05fce14aec610900df61ddc | |
| parent | 110e4ca57a0c02d971f0a8efc71190dfe085a5e5 (diff) | |
| download | libgphoto2-937c1d705cb40a5b2b69b3bda2397b3d679e3048.tar.gz | |
build camlibs as libtool modules with simple names and symbol list
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8065 67ed7778-7388-44ab-90cf-0a291f65f57c
49 files changed, 343 insertions, 293 deletions
diff --git a/camlibs/adc65/Makefile.am b/camlibs/adc65/Makefile.am index 284df53a2..828d5c426 100644 --- a/camlibs/adc65/Makefile.am +++ b/camlibs/adc65/Makefile.am @@ -1,6 +1,7 @@ -camlib_LTLIBRARIES = libgphoto2_adc65.la +camlib_LTLIBRARIES = adc65.la EXTRA_DIST = README TODO Changelog -libgphoto2_adc65_la_SOURCES = adc65.c adc65.h library.c -libgphoto2_adc65_la_LDFLAGS = -module -avoid-version -libgphoto2_adc65_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/agfa-cl20/Makefile.am b/camlibs/agfa-cl20/Makefile.am index c9efc014a..c026c613a 100644 --- a/camlibs/agfa-cl20/Makefile.am +++ b/camlibs/agfa-cl20/Makefile.am @@ -1,8 +1,9 @@ -camlib_LTLIBRARIES = libgphoto2_agfa_cl20.la +camlib_LTLIBRARIES = agfa_cl20.la EXTRA_DIST = README STATUS ChangeLog protocol.txt protocol2.txt commands.txt \ pic-header.txt RANDOM -libgphoto2_agfa_cl20_la_SOURCES = agfa_cl20.c -libgphoto2_agfa_cl20_la_LDFLAGS = -module -avoid-version -libgphoto2_agfa_cl20_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/aox/Makefile.am b/camlibs/aox/Makefile.am index 819a547ef..273dd74ae 100644 --- a/camlibs/aox/Makefile.am +++ b/camlibs/aox/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_aox.la +camlib_LTLIBRARIES = aox.la -libgphoto2_aox_la_SOURCES = library.c aox.c aox.h -libgphoto2_aox_la_LDFLAGS = -module -avoid-version -libgphoto2_aox_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am index 5007509ee..1a667c1e5 100644 --- a/camlibs/barbie/Makefile.am +++ b/camlibs/barbie/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = barbie.df makefile.os2 main.c compile -camlib_LTLIBRARIES = libgphoto2_barbie.la +camlib_LTLIBRARIES = barbie.la -libgphoto2_barbie_la_SOURCES = barbie.c barbie.h library.c library.h -libgphoto2_barbie_la_LDFLAGS = -module -avoid-version -libgphoto2_barbie_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am index 2281493bc..b4dee09b6 100644 --- a/camlibs/canon/Makefile.am +++ b/camlibs/canon/Makefile.am @@ -2,47 +2,10 @@ SUBDIRS = doc EXTRA_DIST = .indent.pro canon.df makefile.os2 ChangeLog urb-interpret -# link different versions as a demo -camlib_LTLIBRARIES = canon.la libcanon.la libgphoto2_canon.la +camlib_LTLIBRARIES = canon.la - -# "classic" version: -# - exports ALL symbols. BAD. (we only need 3!) -# - doesn't define -no-undefine (no Win32) -# - no nice short name (makes renaming the exported symbols to -# canon_LTX_<symbol> slightly more difficult without ## macros) -libgphoto2_canon_la_SOURCES = \ - canon.c canon.h \ - library.c library.h \ - serial.c serial.h \ - usb.c usb.h \ - crc.c crc.h \ - util.c util.h -libgphoto2_canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) -libgphoto2_canon_la_LDFLAGS = -module -avoid-version -libgphoto2_canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la - - -# "common" version: -# + only export the 3 symbols -# + -no-undefined, (i.e. Win32 support) -# + doesn't need lengthy definition in every camlib's Makefile.am -# - no nice short name (makes renaming the exported symbols to -# libcanon_LTX_<symbol> slightly more complicated without ## macros) -# - makes renaming the exported symbols to canon_LTX_<symbol> -# tedious without ## macros -# - makes it impossible to have the same name the module filename and -# the camlib name returned by camera_id() -libcanon_la_SOURCES = \ - canon.c canon.h \ - library.c library.h \ - serial.c serial.h \ - usb.c usb.h \ - crc.c crc.h \ - util.c util.h -libcanon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) -libcanon_la_LDFLAGS = $(CAMLIB_LDFLAGS) -libcanon_la_LIBADD = $(LIBEXIF_LIBS) $(CAMLIB_LIBS) +# for demo purposes, link different versions +# camlib_LTLIBRARIES = canon.la libcanon.la libgphoto2_canon.la # "ideal" version: @@ -67,3 +30,40 @@ canon_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la +# "classic" version: +# - exports ALL symbols. BAD. (we only need 3!) +# - doesn't define -no-undefine (no Win32) +# - no nice short name (makes renaming the exported symbols to +# canon_LTX_<symbol> slightly more difficult without ## macros) +#libgphoto2_canon_la_SOURCES = \ +# canon.c canon.h \ +# library.c library.h \ +# serial.c serial.h \ +# usb.c usb.h \ +# crc.c crc.h \ +# util.c util.h +#libgphoto2_canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) +#libgphoto2_canon_la_LDFLAGS = -module -avoid-version +#libgphoto2_canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la + + +# "common" version: +# + only export the 3 symbols +# + -no-undefined, (i.e. Win32 support) +# + doesn't need lengthy definition in every camlib's Makefile.am +# - no nice short name (makes renaming the exported symbols to +# libcanon_LTX_<symbol> slightly more complicated without ## macros) +# - makes renaming the exported symbols to canon_LTX_<symbol> +# tedious without ## macros +# - makes it impossible to have the same name the module filename and +# the camlib name returned by camera_id() +#libcanon_la_SOURCES = \ +# canon.c canon.h \ +# library.c library.h \ +# serial.c serial.h \ +# usb.c usb.h \ +# crc.c crc.h \ +# util.c util.h +#libcanon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) +#libcanon_la_LDFLAGS = $(CAMLIB_LDFLAGS) +#libcanon_la_LIBADD = $(LIBEXIF_LIBS) $(CAMLIB_LIBS) diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am index 1c823dce7..2286f73d9 100644 --- a/camlibs/casio/Makefile.am +++ b/camlibs/casio/Makefile.am @@ -1,12 +1,13 @@ -camlib_LTLIBRARIES = libgphoto2_casio_qv.la +camlib_LTLIBRARIES = casio_qv.la EXTRA_DIST = PROTOCOL.txt -libgphoto2_casio_qv_la_SOURCES = \ +casio_qv_la_SOURCES = \ casio-qv.c \ casio-qv-commands.c casio-qv-commands.h \ camtojpeg.c camtojpeg.h \ cam2jpgtab.h jpegtab_f.h \ ycctoppm.c ycctoppm.h -libgphoto2_casio_qv_la_LDFLAGS = -module -avoid-version -libgphoto2_casio_qv_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +casio_qv_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(top_srcdir)/camlibs/camlib.sym +casio_qv_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am index 41f370dca..07318ec1e 100644 --- a/camlibs/digita/Makefile.am +++ b/camlibs/digita/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = digita.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_digita.la +camlib_LTLIBRARIES = digita.la -libgphoto2_digita_la_SOURCES = digita.c serial.c usb.c commands.c digita.h -libgphoto2_digita_la_LDFLAGS = -module -avoid-version -libgphoto2_digita_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am index 10c1b5821..8d801f8c5 100644 --- a/camlibs/dimera/Makefile.am +++ b/camlibs/dimera/Makefile.am @@ -1,11 +1,12 @@ EXTRA_DIST = dimera.df makefile.os2 CREDITS Protocol.txt -camlib_LTLIBRARIES = libgphoto2_dimera3500.la +camlib_LTLIBRARIES = dimera3500.la -libgphoto2_dimera3500_la_SOURCES =\ - dimera3500.c \ - mesalib.c mesalib.h\ - dimeratab.h +dimera3500_la_SOURCES =\ + dimera3500.c \ + mesalib.c mesalib.h\ + dimeratab.h -libgphoto2_dimera3500_la_LDFLAGS = -module -avoid-version -libgphoto2_dimera3500_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +dimera3500_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 8ffb3f0fb..7c4feba3a 100644 --- a/camlibs/directory/Makefile.am +++ b/camlibs/directory/Makefile.am @@ -1,13 +1,9 @@ EXTRA_DIST = directory.df directory.def makefile.os2 makedll.cmd -camlib_LTLIBRARIES = libgphoto2_directory.la +camlib_LTLIBRARIES = directory.la -libgphoto2_directory_la_CPPFLAGS = \ - $(CPPFLAGS) $(AM_CPPFLAGS) \ - $(LIBEXIF_CFLAGS) - -libgphoto2_directory_la_SOURCES = directory.c -libgphoto2_directory_la_LDFLAGS = -module -avoid-version -libgphoto2_directory_la_LIBADD = \ - $(LIBEXIF_LIBS) \ - $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/enigma13/Makefile.am b/camlibs/enigma13/Makefile.am index 546651cfd..6a1b08c19 100644 --- a/camlibs/enigma13/Makefile.am +++ b/camlibs/enigma13/Makefile.am @@ -1,7 +1,8 @@ -camlib_LTLIBRARIES = libgphoto2_enigma13.la +camlib_LTLIBRARIES = enigma13.la EXTRA_DIST = STATUS protocol.txt -libgphoto2_enigma13_la_SOURCES = enigma13.c -libgphoto2_enigma13_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_enigma13_la_LDFLAGS = -module -avoid-version +enigma13_la_SOURCES = enigma13.c +enigma13_la_LDFLAGS = = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 037ac8ec0..40739490e 100644 --- a/camlibs/fuji/Makefile.am +++ b/camlibs/fuji/Makefile.am @@ -1,7 +1,8 @@ -camlib_LTLIBRARIES = libgphoto2_fuji.la +camlib_LTLIBRARIES = fuji.la EXTRA_DIST = PROTOCOL -libgphoto2_fuji_la_SOURCES = library.c fuji.c fuji.h -libgphoto2_fuji_la_LDFLAGS = -module -avoid-version -libgphoto2_fuji_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/gsmart300/Makefile.am b/camlibs/gsmart300/Makefile.am index 658d04899..1b366a4e6 100644 --- a/camlibs/gsmart300/Makefile.am +++ b/camlibs/gsmart300/Makefile.am @@ -1,6 +1,7 @@ -camlib_LTLIBRARIES = libgphoto2_gsmart300.la +camlib_LTLIBRARIES = gsmart300.la -libgphoto2_gsmart300_la_SOURCES = gsmart300.c gsmart300.h library.c \ +gsmart300_la_SOURCES = gsmart300.c gsmart300.h library.c \ gsmart300-jpeg-header.h -libgphoto2_gsmart300_la_LDFLAGS = -module -avoid-version -libgphoto2_gsmart300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +gsmart300_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(top_srcdir)/camlibs/camlib.sym +gsmart300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/iclick/Makefile.am b/camlibs/iclick/Makefile.am index 6c4430399..3ffa09821 100644 --- a/camlibs/iclick/Makefile.am +++ b/camlibs/iclick/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_iclick.la +camlib_LTLIBRARIES = iclick.la -libgphoto2_iclick_la_SOURCES = library.c iclick.c iclick.h -libgphoto2_iclick_la_LDFLAGS = -module -avoid-version -libgphoto2_iclick_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am index f71b0d489..1aa397c68 100644 --- a/camlibs/jamcam/Makefile.am +++ b/camlibs/jamcam/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_jamcam.la +camlib_LTLIBRARIES = jamcam.la -libgphoto2_jamcam_la_SOURCES = jamcam.c library.c library.h -libgphoto2_jamcam_la_LDFLAGS = -module -avoid-version -libgphoto2_jamcam_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am index 614707245..b8c4c8592 100644 --- a/camlibs/jd11/Makefile.am +++ b/camlibs/jd11/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = jd11.html -camlib_LTLIBRARIES = libgphoto2_jd11.la +camlib_LTLIBRARIES = jd11.la -libgphoto2_jd11_la_SOURCES = jd11.c serial.h serial.c decomp.h decomp.c -libgphoto2_jd11_la_LDFLAGS = -module -avoid-version -libgphoto2_jd11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am index 163ca2ea3..e52cfb221 100644 --- a/camlibs/kodak/dc120/Makefile.am +++ b/camlibs/kodak/dc120/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = kodak.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_kodak_dc120.la +camlib_LTLIBRARIES = kodak_dc120.la -libgphoto2_kodak_dc120_la_SOURCES = dc120.c dc120.h library.c library.h -libgphoto2_kodak_dc120_la_LDFLAGS = -module -avoid-version -libgphoto2_kodak_dc120_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am index 130211907..fa58cbf1d 100644 --- a/camlibs/kodak/dc210/Makefile.am +++ b/camlibs/kodak/dc210/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = kodak.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_kodak_dc210.la +camlib_LTLIBRARIES = kodak_dc210.la -libgphoto2_kodak_dc210_la_SOURCES = dc210.c dc210.h library.c library.h -libgphoto2_kodak_dc210_la_LDFLAGS = -module -avoid-version -libgphoto2_kodak_dc210_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am index ac0a2c6f0..22f188e43 100644 --- a/camlibs/kodak/dc240/Makefile.am +++ b/camlibs/kodak/dc240/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = kodak.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_kodak_dc240.la +camlib_LTLIBRARIES = kodak_dc240.la -libgphoto2_kodak_dc240_la_SOURCES = dc240.c dc240.h library.c library.h -libgphoto2_kodak_dc240_la_LDFLAGS = -module -avoid-version -libgphoto2_kodak_dc240_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am index 61e762d05..984dadc96 100644 --- a/camlibs/kodak/dc3200/Makefile.am +++ b/camlibs/kodak/dc3200/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = kodak.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_kodak_dc3200.la +camlib_LTLIBRARIES = kodak_dc3200.la -libgphoto2_kodak_dc3200_la_SOURCES = dc3200.c dc3200.h library.c library.h -libgphoto2_kodak_dc3200_la_LDFLAGS = -module -avoid-version -libgphoto2_kodak_dc3200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/ez200/Makefile.am b/camlibs/kodak/ez200/Makefile.am index f80f48e37..db8cf685f 100644 --- a/camlibs/kodak/ez200/Makefile.am +++ b/camlibs/kodak/ez200/Makefile.am @@ -1,7 +1,8 @@ -camlib_LTLIBRARIES = libgphoto2_ez200.la +camlib_LTLIBRARIES = kodak_ez200.la EXTRA_DIST = Protocol.txt -libgphoto2_ez200_la_SOURCES = library.c ez200.c ez200.h -libgphoto2_ez200_la_LDFLAGS = -module -avoid-version -libgphoto2_ez200_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/kodak/ez200/library.c b/camlibs/kodak/ez200/library.c index dc2abf01a..1523e16a5 100644 --- a/camlibs/kodak/ez200/library.c +++ b/camlibs/kodak/ez200/library.c @@ -46,7 +46,7 @@ #include "ez200.h" #include <gphoto2-port.h> -#define GP_MODULE "ez200" +#define GP_MODULE "kodak_ez200" struct _CameraPrivateLibrary { Model model; diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am index a4fb75dec..47ccee2d4 100644 --- a/camlibs/konica/Makefile.am +++ b/camlibs/konica/Makefile.am @@ -1,20 +1,22 @@ SUBDIRS = localization -camlib_LTLIBRARIES = libgphoto2_konica.la libgphoto2_konica_qm150.la +camlib_LTLIBRARIES = konica.la konica_qm150.la EXTRA_DIST = EXPERTS konica.df makefile.os2 qm150.txt DEFS = \ -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\" -libgphoto2_konica_la_SOURCES = \ - lowlevel.c lowlevel.h \ - konica.c konica.h \ - library.c +konica_la_SOURCES = \ + lowlevel.c lowlevel.h \ + konica.c konica.h \ + library.c -libgphoto2_konica_qm150_la_SOURCES = qm150.c -libgphoto2_konica_qm150_la_LDFLAGS = -module -avoid-version -libgphoto2_konica_qm150_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +konica_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(top_srcdir)/camlibs/camlib.sym +konica_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_konica_la_LDFLAGS = -module -avoid-version -libgphoto2_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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/largan/lmini/Makefile.am b/camlibs/largan/lmini/Makefile.am index 61aa06be6..627a62560 100644 --- a/camlibs/largan/lmini/Makefile.am +++ b/camlibs/largan/lmini/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_largan.la +camlib_LTLIBRARIES = largan.la -libgphoto2_largan_la_SOURCES = largan.c lmini.c lmini_ccd.c lmini.h lmini_ccd.h -libgphoto2_largan_la_LDFLAGS = -module -avoid-version -libgphoto2_largan_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/mars/Makefile.am b/camlibs/mars/Makefile.am index f3c7293e2..06b344785 100644 --- a/camlibs/mars/Makefile.am +++ b/camlibs/mars/Makefile.am @@ -1,7 +1,8 @@ -camlib_LTLIBRARIES = libgphoto2_mars.la +camlib_LTLIBRARIES = mars.la EXTRA_DIST = protocol.txt -libgphoto2_mars_la_SOURCES = library.c mars.c mars.h -libgphoto2_mars_la_LDFLAGS = -module -avoid-version -libgphoto2_mars_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am index 188bae7fd..32cdc37dd 100644 --- a/camlibs/minolta/dimagev/Makefile.am +++ b/camlibs/minolta/dimagev/Makefile.am @@ -1,9 +1,9 @@ EXTRA_DIST = dimagev.df makefile.os2 -camlib_LTLIBRARIES = libgphoto2_dimagev.la +camlib_LTLIBRARIES = dimagev.la -libgphoto2_dimagev_la_SOURCES = capture.c data.c delete.c dimagev.c dimagev.h \ +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 - -libgphoto2_dimagev_la_LDFLAGS = -module -avoid-version -libgphoto2_dimagev_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +dimagev_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 047c7f80b..17b8ed46f 100644 --- a/camlibs/mustek/Makefile.am +++ b/camlibs/mustek/Makefile.am @@ -1,8 +1,10 @@ -camlib_LTLIBRARIES = libgphoto2_mustek.la +camlib_LTLIBRARIES = mustek.la EXTRA_DIST = AUTHOR -libgphoto2_mustek_la_SOURCES = mdc800.c core.c image.c io.c rs232.c usb.c core.h image.h io.h mdc800_spec.h print.h rs232.h usb.h - -libgphoto2_mustek_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_mustek_la_LDFLAGS = -module -avoid-version +mustek_la_SOURCES = mdc800.c core.c image.c \ + io.c rs232.c usb.c core.h image.h \ + 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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am index 4cd4450e3..6bfd0c11d 100644 --- a/camlibs/panasonic/Makefile.am +++ b/camlibs/panasonic/Makefile.am @@ -3,13 +3,15 @@ EXTRA_DIST = panasonic.df makefile.os2 dc1000.df dc1580.df SUBDIRS = coolshot l859 camlib_LTLIBRARIES =\ - libgphoto2_panasonic_dc1000.la\ - libgphoto2_panasonic_dc1580.la + panasonic_dc1000.la\ + panasonic_dc1580.la -libgphoto2_panasonic_dc1000_la_SOURCES = dc1000.c dc1000.h dc.c dc.h -libgphoto2_panasonic_dc1000_la_LDFLAGS = -module -avoid-version -libgphoto2_panasonic_dc1000_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_panasonic_dc1580_la_SOURCES = dc1580.c dc1580.h dc.c dc.h dc1000.h -libgphoto2_panasonic_dc1580_la_LDFLAGS = -module -avoid-version -libgphoto2_panasonic_dc1580_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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am index 573c839ff..f85114d96 100644 --- a/camlibs/panasonic/coolshot/Makefile.am +++ b/camlibs/panasonic/coolshot/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_panasonic_coolshot.la +camlib_LTLIBRARIES = panasonic_coolshot.la -libgphoto2_panasonic_coolshot_la_SOURCES = coolshot.c library.c library.h -libgphoto2_panasonic_coolshot_la_LDFLAGS = -module -avoid-version -libgphoto2_panasonic_coolshot_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am index 2ef47bd0e..e917bd110 100644 --- a/camlibs/panasonic/l859/Makefile.am +++ b/camlibs/panasonic/l859/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_panasonic_l859.la +camlib_LTLIBRARIES = panasonic_l859.la -libgphoto2_panasonic_l859_la_SOURCES = l859.c l859.h -libgphoto2_panasonic_l859_la_LDFLAGS = -module -avoid-version -libgphoto2_panasonic_l859_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/pccam300/Makefile.am b/camlibs/pccam300/Makefile.am index eaf9b1bff..8051a469d 100644 --- a/camlibs/pccam300/Makefile.am +++ b/camlibs/pccam300/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_pccam300.la +camlib_LTLIBRARIES = pccam300.la -libgphoto2_pccam300_la_SOURCES = pccam300.c pccam300.h library.c -libgphoto2_pccam300_la_LDFLAGS = -module -avoid-version -libgphoto2_pccam300_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/pccam600/Makefile.am b/camlibs/pccam600/Makefile.am index a68e2eaba..6275c46fd 100644 --- a/camlibs/pccam600/Makefile.am +++ b/camlibs/pccam600/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_pccam600.la +camlib_LTLIBRARIES = pccam600.la -libgphoto2_pccam600_la_SOURCES = pccam600.c pccam600.h library.c -libgphoto2_pccam600_la_LDFLAGS = -module -avoid-version -libgphoto2_pccam600_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am index 9f071b624..fdca3d8be 100644 --- a/camlibs/polaroid/Makefile.am +++ b/camlibs/polaroid/Makefile.am @@ -1,18 +1,25 @@ EXTRA_DIST = jpeg.txt jpeghead.h pdc320.html gt98x.html camlib_LTLIBRARIES = \ - libgphoto2_polaroid_pdc320.la \ - libgphoto2_polaroid_pdc640.la \ - libgphoto2_polaroid_pdc700.la + polaroid_pdc320.la \ + polaroid_pdc640.la \ + polaroid_pdc700.la -libgphoto2_polaroid_pdc320_la_SOURCES = pdc320.c pdc320.h -libgphoto2_polaroid_pdc640_la_SOURCES = pdc640.c jd350e.h jd350e.c jd350e_red.h jd350e_blue.h dlink350f.c dlink350f.h -libgphoto2_polaroid_pdc700_la_SOURCES = pdc700.c -libgphoto2_polaroid_pdc320_la_LDFLAGS = -module -avoid-version -libgphoto2_polaroid_pdc640_la_LDFLAGS = -module -avoid-version -libgphoto2_polaroid_pdc700_la_LDFLAGS = -module -avoid-version +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_polaroid_pdc320_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_polaroid_pdc640_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_polaroid_pdc700_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la + +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_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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/ptp2/Makefile.am b/camlibs/ptp2/Makefile.am index 509e6b259..44173290e 100644 --- a/camlibs/ptp2/Makefile.am +++ b/camlibs/ptp2/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = ptp-pack.c -camlib_LTLIBRARIES = libgphoto2_ptp2.la +camlib_LTLIBRARIES = ptp2.la -libgphoto2_ptp2_la_SOURCES = ptp.c ptp.h library.c ptp-bugs.h -libgphoto2_ptp2_la_LDFLAGS = -module -avoid-version -libgphoto2_ptp2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am index 11177579a..600582108 100644 --- a/camlibs/ricoh/Makefile.am +++ b/camlibs/ricoh/Makefile.am @@ -1,11 +1,13 @@ -camlib_LTLIBRARIES = libgphoto2_ricoh.la libgphoto2_ricoh_g3.la +camlib_LTLIBRARIES = ricoh.la ricoh_g3.la EXTRA_DIST = g3.txt -libgphoto2_ricoh_la_SOURCES = library.c ricoh.c ricoh.h crctab.h -libgphoto2_ricoh_la_LDFLAGS = -module -avoid-version -libgphoto2_ricoh_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_ricoh_g3_la_SOURCES = g3.c -libgphoto2_ricoh_g3_la_LDFLAGS = -module -avoid-version -libgphoto2_ricoh_g3_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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am index 2ab36faea..93896f933 100644 --- a/camlibs/samsung/Makefile.am +++ b/camlibs/samsung/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_samsung.la +camlib_LTLIBRARIES = samsung.la -libgphoto2_samsung_la_SOURCES = samsung.c -libgphoto2_samsung_la_LDFLAGS = -module -avoid-version -libgphoto2_samsung_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am index 28611e160..bb654cf0a 100644 --- a/camlibs/sierra/Makefile.am +++ b/camlibs/sierra/Makefile.am @@ -1,12 +1,14 @@ EXTRA_DIST = sierra.df makefile.os2 PROTOCOL -camlib_LTLIBRARIES = libgphoto2_sierra.la +camlib_LTLIBRARIES = sierra.la -libgphoto2_sierra_la_SOURCES =\ - sierra.c sierra.h\ - library.c library.h\ - sierra-usbwrap.c sierra-usbwrap.h\ - sierra-desc.h sierra-desc.c nikon-desc.c olympus-desc.c epson-desc.c - -libgphoto2_sierra_la_LDFLAGS = -module -avoid-version -libgphoto2_sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(EXIF_LIBS) +sierra_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) $(LIBEXIF_CFLAGS) +sierra_la_SOURCES =\ + sierra.c sierra.h \ + library.c library.h \ + sierra-usbwrap.c sierra-usbwrap.h \ + sierra-desc.h sierra-desc.c \ + 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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS) diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am index d5b18cc6b..3e3e644e3 100644 --- a/camlibs/sipix/Makefile.am +++ b/camlibs/sipix/Makefile.am @@ -1,17 +1,24 @@ -camlib_LTLIBRARIES = \ - libgphoto2_sipix_blink.la \ - libgphoto2_sipix_blink2.la \ - libgphoto2_sipix_web2.la +camlib_LTLIBRARIES = \ + sipix_blink.la \ + sipix_blink2.la \ + sipix_web2.la EXTRA_DIST = web2.html blink.txt xjpeg.c blink2.txt -libgphoto2_sipix_blink_la_SOURCES = blink.c -libgphoto2_sipix_blink2_la_SOURCES = blink2.c -libgphoto2_sipix_web2_la_SOURCES = web2.c -libgphoto2_sipix_blink_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_sipix_blink_la_LDFLAGS = -module -avoid-version -libgphoto2_sipix_blink2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_sipix_blink2_la_LDFLAGS = -module -avoid-version @LIBJPEG@ -libgphoto2_sipix_web2_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la -libgphoto2_sipix_web2_la_LDFLAGS = -module -avoid-version +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_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_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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/smal/Makefile.am b/camlibs/smal/Makefile.am index 23c8b0f44..9849f52b1 100644 --- a/camlibs/smal/Makefile.am +++ b/camlibs/smal/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_smal.la +camlib_LTLIBRARIES = smal.la -libgphoto2_smal_la_SOURCES = smal.c ultrapocket.c smal.h ultrapocket.h -libgphoto2_smal_la_LDFLAGS = -module -avoid-version -libgphoto2_smal_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sonix/Makefile.am b/camlibs/sonix/Makefile.am index 641c8432a..b4bc7bf9f 100644 --- a/camlibs/sonix/Makefile.am +++ b/camlibs/sonix/Makefile.am @@ -1,13 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_sonix.la +camlib_LTLIBRARIES = sonix.la -INCLUDES = \ - -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 - -libgphoto2_sonix_la_SOURCES = library.c sonix.c sonix.h -libgphoto2_sonix_la_LDFLAGS = -module -avoid-version -libgphoto2_sonix_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am index 7314b09f4..1421d8801 100644 --- a/camlibs/sonydscf1/Makefile.am +++ b/camlibs/sonydscf1/Makefile.am @@ -1,11 +1,11 @@ EXTRA_DIST = sonydscf1.df makefile.os2 readme todo -camlib_LTLIBRARIES = libgphoto2_sony_dscf1.la +camlib_LTLIBRARIES = sony_dscf1.la -EXTRA_libgphoto2_sony_dscf1_la_SOURCES = dsc_f1.c -libgphoto2_sony_dscf1_la_SOURCES = \ +EXTRA_sony_dscf1_la_SOURCES = dsc_f1.c +sony_dscf1_la_SOURCES = \ command.c getuint.c chotplay.c sonydscf1.c sonydscf1.h \ command.h getuint.h chotplay.h pmp.h common.h - -libgphoto2_sony_dscf1_la_LDFLAGS = -module -avoid-version -libgphoto2_sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +sony_dscf1_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 69a6bca6f..73295d6ae 100644 --- a/camlibs/sonydscf55/Makefile.am +++ b/camlibs/sonydscf55/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_sony_dscf55.la +camlib_LTLIBRARIES = sony_dscf55.la -libgphoto2_sony_dscf55_la_SOURCES = sony.c sony.h camera.c nls.h -libgphoto2_sony_dscf55_la_LDFLAGS = -module -avoid-version -libgphoto2_sony_dscf55_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/soundvision/Makefile.am b/camlibs/soundvision/Makefile.am index ed8aa81dc..f8af230ac 100644 --- a/camlibs/soundvision/Makefile.am +++ b/camlibs/soundvision/Makefile.am @@ -1,5 +1,7 @@ -camlib_LTLIBRARIES = libgphoto2_soundvision.la +camlib_LTLIBRARIES = soundvision.la -libgphoto2_soundvision_la_SOURCES = soundvision.c agfa_cl18.c tiger_fastflicks.c commands.c commands.h soundvision.h -libgphoto2_soundvision_la_LDFLAGS = -module -avoid-version -libgphoto2_soundvision_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/spca50x/Makefile.am b/camlibs/spca50x/Makefile.am index e38fb44d6..4d49f4239 100644 --- a/camlibs/spca50x/Makefile.am +++ b/camlibs/spca50x/Makefile.am @@ -1,12 +1,13 @@ -camlib_LTLIBRARIES = libgphoto2_spca50x.la +camlib_LTLIBRARIES = spca50x.la EXTRA_DIST = ChangeLog.benq ChangeLog.gsmart ChangeLog.spca504_flash lsusb-v -libgphoto2_spca50x_la_SOURCES = spca50x.c spca50x.h \ - spca50x-flash.c spca50x-flash.h \ - spca50x-sdram.c spca50x-sdram.h \ - library.c \ - spca50x-jpeg-header.h spca50x-registers.h \ - spca50x-avi-header.h -libgphoto2_spca50x_la_LDFLAGS = -module -avoid-version -libgphoto2_spca50x_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +spca50x_la_SOURCES = spca50x.c spca50x.h \ + spca50x-flash.c spca50x-flash.h \ + spca50x-sdram.c spca50x-sdram.h \ + library.c \ + spca50x-jpeg-header.h spca50x-registers.h \ + spca50x-avi-header.h +spca50x_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 95e139a88..762578753 100644 --- a/camlibs/sq905/Makefile.am +++ b/camlibs/sq905/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_sq905.la +camlib_LTLIBRARIES = sq905.la -libgphoto2_sq905_la_SOURCES = library.c sq905.c sq905.h postprocess.c -libgphoto2_sq905_la_LDFLAGS = -module -avoid-version -libgphoto2_sq905_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/stv0674/Makefile.am b/camlibs/stv0674/Makefile.am index 9dbab705b..22eebf6d6 100644 --- a/camlibs/stv0674/Makefile.am +++ b/camlibs/stv0674/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = Protocol Changelog -camlib_LTLIBRARIES = libgphoto2_stv0674.la +camlib_LTLIBRARIES = stv0674.la -libgphoto2_stv0674_la_SOURCES = stv0674.c stv0674.h library.c library.h -libgphoto2_stv0674_la_LDFLAGS = -module -avoid-version -libgphoto2_stv0674_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am index 4fa475bd6..0d3f10603 100644 --- a/camlibs/stv0680/Makefile.am +++ b/camlibs/stv0680/Makefile.am @@ -1,11 +1,12 @@ EXTRA_DIST = stv0680.df makefile.os2 CREDITS LICENCE README.pdf 680_commands_and_communication_sdk.pdf.gz -camlib_LTLIBRARIES = libgphoto2_stv0680.la +camlib_LTLIBRARIES = stv0680.la -libgphoto2_stv0680_la_SOURCES = stv0680.c stv0680.h library.c library.h \ - bayer.c bayer.h sharpen.c sharpen.h \ - saturate.c saturate.h \ - demosaic_sharpen.h demosaic_sharpen.c +stv0680_la_SOURCES = stv0680.c stv0680.h library.c library.h \ + bayer.c bayer.h sharpen.c sharpen.h \ + saturate.c saturate.h \ + demosaic_sharpen.h demosaic_sharpen.c -libgphoto2_stv0680_la_LDFLAGS = -module -avoid-version -libgphoto2_stv0680_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +stv0680_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(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 5d0901aa7..7c3b3ee21 100644 --- a/camlibs/sx330z/Makefile.am +++ b/camlibs/sx330z/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_sx330z.la +camlib_LTLIBRARIES = sx330z.la -libgphoto2_sx330z_la_SOURCES = library.c sx330z.c sx330z.h -libgphoto2_sx330z_la_LDFLAGS = -module -avoid-version -libgphoto2_sx330z_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am index af027d70d..dc147a400 100644 --- a/camlibs/template/Makefile.am +++ b/camlibs/template/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_template.la +camlib_LTLIBRARIES = template.la -libgphoto2_template_la_SOURCES = template.c -libgphoto2_template_la_LDFLAGS = -module -avoid-version -libgphoto2_template_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/toshiba/pdrm11/Makefile.am b/camlibs/toshiba/pdrm11/Makefile.am index 2e959af21..72b028e2d 100644 --- a/camlibs/toshiba/pdrm11/Makefile.am +++ b/camlibs/toshiba/pdrm11/Makefile.am @@ -1,5 +1,6 @@ -camlib_LTLIBRARIES = libgphoto2_toshiba_pdrm11.la +camlib_LTLIBRARIES = toshiba_pdrm11.la -libgphoto2_toshiba_pdrm11_la_SOURCES = library.c pdrm11.c pdrm11.h -libgphoto2_toshiba_pdrm11_la_LDFLAGS = -module -avoid-version -libgphoto2_toshiba_pdrm11_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.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_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la |