diff options
| author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-12-26 22:30:11 +0000 |
|---|---|---|
| committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-12-26 22:30:11 +0000 |
| commit | d9e41c4de0f488d6ee932e6db669418775c01008 (patch) | |
| tree | 04daf253e9afb3c91cf27163dc99eac4fad3dff0 /camlibs | |
| parent | 988b9b987ce53f04f4bbe3ae3583ff0e5981298e (diff) | |
| download | libgphoto2-d9e41c4de0f488d6ee932e6db669418775c01008.tar.gz | |
2.3.1.0.trunk, non-recursive camlibs build
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9736 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs')
110 files changed, 773 insertions, 671 deletions
diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am index 63ab3c0b7..0aeff01a4 100644 --- a/camlibs/Makefile.am +++ b/camlibs/Makefile.am @@ -1,5 +1,122 @@ -## Process this file with automake to generate a GNU Makefile - -SUBDIRS = @SUBDIRS_CAMLIBS@ +# If you only want to build a single camlib (say agfa_cl20), run +# gmake -C camlibs agfa-cl20.la +# or +# ( cd camlibs && make agfa-cl20.la ) +# +# The only SUBDIRS here are "." (to run all-local checking the +# definition of the camlibs) and the special ones for building docs +# and stuff. +# +# Building the camlibs itself is defined in the Makefile-files +# included below. +SUBDIRS = . canon/doc konica/localization +# Define the common variables added to in the included Makefile-files +CLEANFILES = EXTRA_DIST = camlib.sym +camlibdoc_DATA = +localization_DATA = +localizationdir = +noinst_DATA = +noinst_LTLIBRARIES = +EXTRA_LTLIBRARIES = + +# All camlibs are defined as EXTRA_LTLIBRARIES. This requires that +# all camlibs have -rpath set explicitly in foobar_la_LDFLAGS. +# You're probably best off by using the camlib_* variables defined +# below. +camlib_LTLIBRARIES = $(BUILD_THESE_CAMLIBS) + +# Define the compile/link/etc. flags common to all camlibs in one place, +# i.e. here. + +camlib_dependencies = $(top_srcdir)/camlibs/camlib.sym +camlib_ldflags = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols '$(top_srcdir)/camlibs/camlib.sym' \ + -rpath '$(camlibdir)' +camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la + +# You can generate this Makefile-files include list by running +# find . -name Makefile-files -exec echo include {} \; | sort | sed 's| ./| |g' +include adc65/Makefile-files +include agfa-cl20/Makefile-files +include aox/Makefile-files +include barbie/Makefile-files +include canon/Makefile-files +include casio/Makefile-files +include clicksmart310/Makefile-files +include digigr8/Makefile-files +include digita/Makefile-files +include dimera/Makefile-files +include directory/Makefile-files +include enigma13/Makefile-files +include fuji/Makefile-files +include gsmart300/Makefile-files +include hp215/Makefile-files +include iclick/Makefile-files +include jamcam/Makefile-files +include jd11/Makefile-files +include kodak/dc120/Makefile-files +include kodak/dc210/Makefile-files +include kodak/dc240/Makefile-files +include kodak/dc3200/Makefile-files +include kodak/ez200/Makefile-files +include kodak/Makefile-files +include konica/Makefile-files +include largan/lmini/Makefile-files +include lg_gsm/Makefile-files +include mars/Makefile-files +include minolta/dimagev/Makefile-files +include minolta/Makefile-files +include mustek/Makefile-files +include panasonic/coolshot/Makefile-files +include panasonic/l859/Makefile-files +include panasonic/Makefile-files +include pccam300/Makefile-files +include pccam600/Makefile-files +include polaroid/Makefile-files +include ptp2/Makefile-files +include ricoh/Makefile-files +include samsung/Makefile-files +include sierra/Makefile-files +include sipix/Makefile-files +include smal/Makefile-files +include sonix/Makefile-files +include sonydscf1/Makefile-files +include sonydscf55/Makefile-files +include soundvision/Makefile-files +include spca50x/Makefile-files +include sq905/Makefile-files +include stv0674/Makefile-files +include stv0680/Makefile-files +include sx330z/Makefile-files +include template/Makefile-files +include toshiba/pdrm11/Makefile-files +# End of list of Makefile-files + +# Print list of GP_CAMLIB() definitions suitable for adding to +# configure.ac +print-camlibs: Makefile + @for x in $(EXTRA_LTLIBRARIES); do \ + y="$$(basename "$$x" ".la")"; \ + echo "GP_CAMLIB([$$y])dnl"; \ + done + +# Make sure that the list of camlibs defined in configure.ac using +# GP_CAMLIB(...) and the list of camlibs defined in */Makefile-files +# match. +CLEANFILES += all-src-camlibs all-def-camlibs +all-local: Makefile + @:; \ + (for x in $(EXTRA_LTLIBRARIES) template.la; do echo "$$(basename "$$x" ".la")"; done) \ + | sort > all-src-camlibs; \ + (for x in $(ALL_DEFINED_CAMLIBS); do echo "$$x"; done) \ + | sort > all-def-camlibs; \ + if cmp all-def-camlibs all-src-camlibs; then :; else \ + diff -u all-def-camlibs all-src-camlibs; \ + echo "List of camlibs in configure.ac is out of date."; \ + echo "Have a developer update it using \"make -C camlibs print-camlibs\"."; \ + exit 1; \ + fi + +# End of camlibs/Makefile.am diff --git a/camlibs/adc65/Makefile-files b/camlibs/adc65/Makefile-files new file mode 100644 index 000000000..bdfbc0448 --- /dev/null +++ b/camlibs/adc65/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += adc65/README.adc65 adc65/TODO adc65/Changelog +camlibdoc_DATA += adc65/README.adc65 + +EXTRA_LTLIBRARIES += adc65.la + +adc65_la_SOURCES = adc65/adc65.c adc65/adc65.h adc65/library.c +adc65_la_LDFLAGS = $(camlib_ldflags) +adc65_la_DEPENDENCIES = $(camlib_dependencies) +adc65_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/adc65/Makefile.am b/camlibs/adc65/Makefile.am deleted file mode 100644 index b957d91dd..000000000 --- a/camlibs/adc65/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = adc65.la - -EXTRA_DIST = README.adc65 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 - -camlibdoc_DATA = README.adc65 diff --git a/camlibs/agfa-cl20/Makefile-files b/camlibs/agfa-cl20/Makefile-files new file mode 100644 index 000000000..0c7e81acd --- /dev/null +++ b/camlibs/agfa-cl20/Makefile-files @@ -0,0 +1,15 @@ +EXTRA_DIST += \ + agfa-cl20/README.agfa-cl20 \ + agfa-cl20/STATUS agfa-cl20/ChangeLog \ + agfa-cl20/protocol.txt agfa-cl20/protocol2.txt \ + agfa-cl20/commands.txt \ + agfa-cl20/pic-header.txt agfa-cl20/RANDOM + +camlibdoc_DATA += agfa-cl20/README.agfa-cl20 + +EXTRA_LTLIBRARIES += agfa_cl20.la + +agfa_cl20_la_SOURCES = agfa-cl20/agfa_cl20.c +agfa_cl20_la_LDFLAGS = $(camlib_ldflags) +agfa_cl20_la_DEPENDENCIES = $(camlib_dependencies) +agfa_cl20_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/agfa-cl20/Makefile.am b/camlibs/agfa-cl20/Makefile.am deleted file mode 100644 index cb055cc73..000000000 --- a/camlibs/agfa-cl20/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -camlib_LTLIBRARIES = agfa_cl20.la - -EXTRA_DIST = README.agfa-cl20 STATUS ChangeLog protocol.txt protocol2.txt commands.txt \ - pic-header.txt RANDOM - -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 - -camlibdoc_DATA = README.agfa-cl20 diff --git a/camlibs/aox/Makefile-files b/camlibs/aox/Makefile-files new file mode 100644 index 000000000..a358a0481 --- /dev/null +++ b/camlibs/aox/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_LTLIBRARIES += aox.la +camlibdoc_DATA += aox/README.aox + +EXTRA_DIST += aox/README.aox + +aox_la_SOURCES = aox/library.c aox/aox.c aox/aox.h +aox_la_LDFLAGS = $(camlib_ldflags) +aox_la_DEPENDENCIES = $(camlib_dependencies) +aox_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/aox/Makefile.am b/camlibs/aox/Makefile.am deleted file mode 100644 index 14011e89a..000000000 --- a/camlibs/aox/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.aox -EXTRA_DIST = README.aox diff --git a/camlibs/barbie/Makefile-files b/camlibs/barbie/Makefile-files new file mode 100644 index 000000000..832b1ff94 --- /dev/null +++ b/camlibs/barbie/Makefile-files @@ -0,0 +1,10 @@ +EXTRA_DIST += barbie/main.c + +EXTRA_LTLIBRARIES += barbie.la + +barbie_la_SOURCES = \ + barbie/barbie.c barbie/barbie.h \ + barbie/library.c barbie/library.h +barbie_la_LDFLAGS = $(camlib_ldflags) +barbie_la_DEPENDENCIES = $(camlib_dependencies) +barbie_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am deleted file mode 100644 index 44ba7ad27..000000000 --- a/camlibs/barbie/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST = main.c - -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-files b/camlibs/canon/Makefile-files new file mode 100644 index 000000000..9cbf056fd --- /dev/null +++ b/camlibs/canon/Makefile-files @@ -0,0 +1,26 @@ +EXTRA_LTLIBRARIES += canon.la + +camlibdoc_DATA += canon/README.canon + +EXTRA_DIST += canon/.indent.pro canon/ChangeLog canon/urb-interpret canon/README.canon + +# "ideal" version: +# + only export the 3 symbols +# + -no-undefined, (i.e. Win32 support) +# - needs lengthy definition in every camlib's Makefile.am +# + nice short name +# + makes renaming the exported symbols to canon_LTX_<symbol> realistic +# without ## macros +# + makes it possible to have the same name the module filename and +# the camlib name returned by camera_id() +canon_la_SOURCES = \ + canon/canon.c canon/canon.h \ + canon/library.c canon/library.h \ + canon/serial.c canon/serial.h \ + canon/usb.c canon/usb.h \ + canon/crc.c canon/crc.h \ + canon/util.c canon/util.h +canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) +canon_la_LDFLAGS = $(camlib_ldflags) +canon_la_DEPENDENCIES = $(camlib_dependencies) +canon_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS) diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am deleted file mode 100644 index 44d7f79f2..000000000 --- a/camlibs/canon/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -SUBDIRS = doc - -EXTRA_DIST = .indent.pro ChangeLog urb-interpret README.canon - -camlibdoc_DATA = README.canon - -camlib_LTLIBRARIES = canon.la - -# for demo purposes, link different versions -# camlib_LTLIBRARIES = canon.la libcanon.la libgphoto2_canon.la - - -# "ideal" version: -# + only export the 3 symbols -# + -no-undefined, (i.e. Win32 support) -# - needs lengthy definition in every camlib's Makefile.am -# + nice short name -# + makes renaming the exported symbols to canon_LTX_<symbol> realistic -# without ## macros -# + makes it possible to have the same name the module filename and -# the camlib name returned by camera_id() -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 -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 - - -# "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/canon/doc/Protocol.xml b/camlibs/canon/doc/Protocol.xml index e5b457b04..52f4bf52f 100644 --- a/camlibs/canon/doc/Protocol.xml +++ b/camlibs/canon/doc/Protocol.xml @@ -447,7 +447,7 @@ <para>The following figure illustrates the lower layers of the protocol used by some Canon PowerShot cameras:</para> - <table id="tbl.SerialLayers" frame="none" cellpadding="0" cellspacing="0"><title>Layers of the serial protocol</title> + <table id="tbl.SerialLayers" frame="none"><title>Layers of the serial protocol</title> <tgroup cols="3" align="left"> <colspec colnum="1" colname="col1" align="center"/> <colspec colnum="2" colname="col2" align="center"/> @@ -1391,9 +1391,9 @@ do { <entry><para>0x00000086</para></entry> <entry> <para>Returned by camera in newer protocol (e.g. EOS - 20D) from <link - linkend="sec.USBnewUnlockKeys">“Unlock - keys”</link> when keys weren't locked. + 20D) from <!--link + linkend="sec.USBnewUnlockKeys" -->“Unlock + keys”<!--/link--> when keys weren't locked. </para> </entry > </row> diff --git a/camlibs/casio/Makefile-files b/camlibs/casio/Makefile-files new file mode 100644 index 000000000..a270b7d54 --- /dev/null +++ b/camlibs/casio/Makefile-files @@ -0,0 +1,14 @@ +EXTRA_DIST += casio/PROTOCOL.txt + +EXTRA_LTLIBRARIES += casio_qv.la + +casio_qv_la_SOURCES = \ + casio/casio-qv.c \ + casio/casio-qv-commands.c casio/casio-qv-commands.h \ + casio/camtojpeg.c casio/camtojpeg.h \ + casio/cam2jpgtab.h casio/jpegtab_f.h \ + casio/ycctoppm.c casio/ycctoppm.h + +casio_qv_la_LDFLAGS = $(camlib_ldflags) +casio_qv_la_DEPENDENCIES = $(camlib_dependencies) +casio_qv_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am deleted file mode 100644 index 846a2ec70..000000000 --- a/camlibs/casio/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -camlib_LTLIBRARIES = casio_qv.la -EXTRA_DIST = PROTOCOL.txt - -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 - -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/clicksmart310/Makefile-files b/camlibs/clicksmart310/Makefile-files new file mode 100644 index 000000000..abe155fec --- /dev/null +++ b/camlibs/clicksmart310/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += clicksmart310/README.clicksmart310 +camlibdoc_DATA += clicksmart310/README.clicksmart310 + +EXTRA_LTLIBRARIES += clicksmart310.la + +clicksmart310_la_SOURCES = \ + clicksmart310/library.c \ + clicksmart310/clicksmart.c clicksmart310/clicksmart.h \ + clicksmart310/spca50x-jpeg-header.h +clicksmart310_la_LDFLAGS = $(camlib_ldflags) +clicksmart310_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/clicksmart310/Makefile.am b/camlibs/clicksmart310/Makefile.am deleted file mode 100644 index a5c0fd581..000000000 --- a/camlibs/clicksmart310/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -camlib_LTLIBRARIES = clicksmart310.la - -clicksmart310_la_SOURCES = library.c clicksmart.c clicksmart.h spca50x-jpeg-header.h -clicksmart310_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ - -export-symbols $(top_srcdir)/camlibs/camlib.sym -clicksmart310_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la - -camlibdoc_DATA = README.clicksmart310 -EXTRA_DIST = README.clicksmart310 diff --git a/camlibs/digigr8/Makefile-files b/camlibs/digigr8/Makefile-files new file mode 100644 index 000000000..7dba28933 --- /dev/null +++ b/camlibs/digigr8/Makefile-files @@ -0,0 +1,12 @@ +EXTRA_DIST += digigr8/README.digigr8 +camlibdoc_DATA += digigr8/README.digigr8 + +EXTRA_LTLIBRARIES += digigr8.la + +digigr8_la_SOURCES = \ + digigr8/library.c \ + digigr8/digigr8.c digigr8/digigr8.h \ + digigr8/digi_postprocess.c +digigr8_la_LDFLAGS = $(camlib_ldflags) +digigr8_la_DEPENDENCIES = $(camlib_dependencies) +digigr8_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/digigr8/Makefile.am b/camlibs/digigr8/Makefile.am deleted file mode 100644 index c34901ab9..000000000 --- a/camlibs/digigr8/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.digigr8 -EXTRA_DIST = README.digigr8 diff --git a/camlibs/digita/Makefile-files b/camlibs/digita/Makefile-files new file mode 100644 index 000000000..1ffd30c09 --- /dev/null +++ b/camlibs/digita/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_LTLIBRARIES += digita.la + +digita_la_SOURCES = \ + digita/digita.c \ + digita/serial.c \ + digita/usb.c \ + digita/commands.c \ + digita/digita.h +digita_la_LDFLAGS = $(camlib_ldflags) +digita_la_DEPENDENCIES = $(camlib_dependencies) +digita_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am deleted file mode 100644 index f0f149879..000000000 --- a/camlibs/digita/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/dimera/Makefile-files new file mode 100644 index 000000000..89f5b463a --- /dev/null +++ b/camlibs/dimera/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += dimera/CREDITS dimera/Protocol.txt + +EXTRA_LTLIBRARIES += dimera3500.la + +dimera3500_la_SOURCES =\ + dimera/dimera3500.c \ + dimera/mesalib.c dimera/mesalib.h\ + dimera/dimeratab.h +dimera3500_la_LDFLAGS = $(camlib_ldflags) +dimera3500_la_DEPENDENCIES = $(camlib_dependencies) +dimera3500_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am deleted file mode 100644 index b303a8a98..000000000 --- a/camlibs/dimera/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = CREDITS Protocol.txt - -camlib_LTLIBRARIES = dimera3500.la - -dimera3500_la_SOURCES =\ - dimera3500.c \ - mesalib.c mesalib.h\ - dimeratab.h - -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-files b/camlibs/directory/Makefile-files new file mode 100644 index 000000000..61dc986ed --- /dev/null +++ b/camlibs/directory/Makefile-files @@ -0,0 +1,7 @@ +EXTRA_LTLIBRARIES += directory.la + +directory_la_SOURCES = directory/directory.c +directory_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) +directory_la_LDFLAGS = $(camlib_ldflags) +directory_la_DEPENDENCIES = $(camlib_dependencies) +directory_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am deleted file mode 100644 index 03872e2fd..000000000 --- a/camlibs/directory/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -camlib_LTLIBRARIES = directory.la - -directory_la_CPPFLAGS = $(AM_CPPFLAGS) $(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-files b/camlibs/enigma13/Makefile-files new file mode 100644 index 000000000..23a4aea5b --- /dev/null +++ b/camlibs/enigma13/Makefile-files @@ -0,0 +1,10 @@ +EXTRA_DIST += enigma13/STATUS enigma13/protocol.txt enigma13/README.enigma13 +camlibdoc_DATA += enigma13/README.enigma13 + +EXTRA_LTLIBRARIES += enigma13.la + +enigma13_la_SOURCES = enigma13/enigma13.c +enigma13_la_LDFLAGS = $(camlib_ldflags) +enigma13_la_DEPENDENCIES = $(camlib_dependencies) +enigma13_la_LIBADD = $(camlib_libadd) + diff --git a/camlibs/enigma13/Makefile.am b/camlibs/enigma13/Makefile.am deleted file mode 100644 index a7aa903cd..000000000 --- a/camlibs/enigma13/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = enigma13.la - -EXTRA_DIST = STATUS protocol.txt README.enigma13 - -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 - -camlibdoc_DATA = README.enigma13 diff --git a/camlibs/fuji/Makefile-files b/camlibs/fuji/Makefile-files new file mode 100644 index 000000000..b1886b947 --- /dev/null +++ b/camlibs/fuji/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_DIST += fuji/PROTOCOL + +EXTRA_LTLIBRARIES += fuji.la + +fuji_la_SOURCES = fuji/library.c fuji/fuji.c fuji/fuji.h +fuji_la_LDFLAGS = $(camlib_ldflags) +fuji_la_DEPENDENCIES = $(camlib_dependencies) +fuji_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/fuji/Makefile.am b/camlibs/fuji/Makefile.am deleted file mode 100644 index 06d1213bb..000000000 --- a/camlibs/fuji/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -camlib_LTLIBRARIES = fuji.la - -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-files b/camlibs/gsmart300/Makefile-files new file mode 100644 index 000000000..95116bb3e --- /dev/null +++ b/camlibs/gsmart300/Makefile-files @@ -0,0 +1,12 @@ +EXTRA_DIST += gsmart300/README.gsmart300 +camlibdoc_DATA += gsmart300/README.gsmart300 + +EXTRA_LTLIBRARIES += gsmart300.la + +gsmart300_la_SOURCES = \ + gsmart300/gsmart300.c gsmart300/gsmart300.h \ + gsmart300/library.c \ + gsmart300/gsmart300-jpeg-header.h +gsmart300_la_LDFLAGS = $(camlib_ldflags) +gsmart300_la_DEPENDENCIES = $(camlib_dependencies) +gsmart300_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/gsmart300/Makefile.am b/camlibs/gsmart300/Makefile.am deleted file mode 100644 index fc336c8d1..000000000 --- a/camlibs/gsmart300/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = gsmart300.la - -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 - -camlibdoc_DATA = README.gsmart300 -EXTRA_DIST = README.gsmart300 diff --git a/camlibs/hp215/Makefile-files b/camlibs/hp215/Makefile-files new file mode 100644 index 000000000..03572e0e3 --- /dev/null +++ b/camlibs/hp215/Makefile-files @@ -0,0 +1,6 @@ +EXTRA_LTLIBRARIES += hp215.la + +hp215_la_SOURCES = hp215/hp215.c hp215/hp215.h hp215/crctab.h +hp215_la_LDFLAGS = $(camlib_ldflags) +hp215_la_DEPENDENCIES = $(camlib_dependencies) +hp215_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/hp215/Makefile.am b/camlibs/hp215/Makefile.am deleted file mode 100644 index e5da81926..000000000 --- a/camlibs/hp215/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/iclick/Makefile-files new file mode 100644 index 000000000..6134ae466 --- /dev/null +++ b/camlibs/iclick/Makefile-files @@ -0,0 +1,10 @@ +EXTRA_DIST += iclick/README.iclick +camlibdoc_DATA += iclick/README.iclick + +EXTRA_LTLIBRARIES += iclick.la + +iclick_la_SOURCES = iclick/library.c iclick/iclick.c iclick/iclick.h +iclick_la_LDFLAGS = $(camlib_ldflags) +iclick_la_DEPENDENCIES = $(camlib_dependencies) +iclick_la_LIBADD = $(camlib_libadd) + diff --git a/camlibs/iclick/Makefile.am b/camlibs/iclick/Makefile.am deleted file mode 100644 index 58de06389..000000000 --- a/camlibs/iclick/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.iclick -EXTRA_DIST = README.iclick diff --git a/camlibs/jamcam/Makefile-files b/camlibs/jamcam/Makefile-files new file mode 100644 index 000000000..8edaa12cc --- /dev/null +++ b/camlibs/jamcam/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += jamcam/README.jamcam +camlibdoc_DATA += jamcam/README.jamcam + +EXTRA_LTLIBRARIES += jamcam.la + +jamcam_la_SOURCES = jamcam/jamcam.c jamcam/library.c jamcam/library.h +jamcam_la_LDFLAGS = $(camlib_ldflags) +jamcam_la_DEPENDENCIES = $(camlib_dependencies) +jamcam_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am deleted file mode 100644 index bfb58eaa5..000000000 --- a/camlibs/jamcam/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.jamcam -EXTRA_DIST = README.jamcam diff --git a/camlibs/jd11/Makefile-files b/camlibs/jd11/Makefile-files new file mode 100644 index 000000000..e95cf6070 --- /dev/null +++ b/camlibs/jd11/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += jd11/jd11.html + +EXTRA_LTLIBRARIES += jd11.la + +jd11_la_SOURCES = \ + jd11/jd11.c \ + jd11/serial.h jd11/serial.c \ + jd11/decomp.h jd11/decomp.c +jd11_la_LDFLAGS = $(camlib_ldflags) +jd11_la_DEPENDENCIES = $(camlib_dependencies) +jd11_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am deleted file mode 100644 index 9d5ec1e87..000000000 --- a/camlibs/jd11/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST = jd11.html - -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/Makefile-files b/camlibs/kodak/Makefile-files new file mode 100644 index 000000000..cb57b650f --- /dev/null +++ b/camlibs/kodak/Makefile-files @@ -0,0 +1,3 @@ +# SUBDIRS = dc120 dc210 dc240 dc3200 ez200 + +EXTRA_DIST += kodak/CAMERAS diff --git a/camlibs/kodak/Makefile.am b/camlibs/kodak/Makefile.am deleted file mode 100644 index 5b719eeed..000000000 --- a/camlibs/kodak/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to generate a GNU Makefile - -SUBDIRS = dc120 dc210 dc240 dc3200 ez200 - -EXTRA_DIST = CAMERAS diff --git a/camlibs/kodak/dc120/Makefile-files b/camlibs/kodak/dc120/Makefile-files new file mode 100644 index 000000000..a768c9c7b --- /dev/null +++ b/camlibs/kodak/dc120/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_LTLIBRARIES += kodak_dc120.la + +kodak_dc120_la_SOURCES = \ + kodak/dc120/dc120.c kodak/dc120/dc120.h \ + kodak/dc120/library.c kodak/dc120/library.h +kodak_dc120_la_LDFLAGS = $(camlib_ldflags) +kodak_dc120_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc120_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am deleted file mode 100644 index 86fb58512..000000000 --- a/camlibs/kodak/dc120/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/kodak/dc210/Makefile-files new file mode 100644 index 000000000..b1a3ec480 --- /dev/null +++ b/camlibs/kodak/dc210/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_LTLIBRARIES += kodak_dc210.la + +kodak_dc210_la_SOURCES = \ + kodak/dc210/dc210.c kodak/dc210/dc210.h \ + kodak/dc210/library.c kodak/dc210/library.h +kodak_dc210_la_LDFLAGS = $(camlib_ldflags) +kodak_dc210_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc210_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am deleted file mode 100644 index 23602d96d..000000000 --- a/camlibs/kodak/dc210/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/kodak/dc240/Makefile-files new file mode 100644 index 000000000..65a1c5a54 --- /dev/null +++ b/camlibs/kodak/dc240/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_LTLIBRARIES += kodak_dc240.la + +kodak_dc240_la_SOURCES = \ + kodak/dc240/dc240.c kodak/dc240/dc240.h \ + kodak/dc240/library.c kodak/dc240/library.h +kodak_dc240_la_LDFLAGS = $(camlib_ldflags) +kodak_dc240_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc240_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am deleted file mode 100644 index 4d9249c1a..000000000 --- a/camlibs/kodak/dc240/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/kodak/dc3200/Makefile-files new file mode 100644 index 000000000..d3a19926e --- /dev/null +++ b/camlibs/kodak/dc3200/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_LTLIBRARIES += kodak_dc3200.la + +kodak_dc3200_la_SOURCES = \ + kodak/dc3200/dc3200.c kodak/dc3200/dc3200.h \ + kodak/dc3200/library.c kodak/dc3200/library.h +kodak_dc3200_la_LDFLAGS = $(camlib_ldflags) +kodak_dc3200_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc3200_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am deleted file mode 100644 index d6ff99486..000000000 --- a/camlibs/kodak/dc3200/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/kodak/ez200/Makefile-files new file mode 100644 index 000000000..f364288e0 --- /dev/null +++ b/camlibs/kodak/ez200/Makefile-files @@ -0,0 +1,10 @@ +EXTRA_DIST += kodak/ez200/Protocol.txt + +EXTRA_LTLIBRARIES += kodak_ez200.la + +kodak_ez200_la_SOURCES = \ + kodak/ez200/library.c \ + kodak/ez200/ez200.c kodak/ez200/ez200.h +kodak_ez200_la_LDFLAGS = $(camlib_ldflags) +kodak_ez200_la_DEPENDENCIES = $(camlib_dependencies) +kodak_ez200_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/ez200/Makefile.am b/camlibs/kodak/ez200/Makefile.am deleted file mode 100644 index 4e635a0fe..000000000 --- a/camlibs/kodak/ez200/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -camlib_LTLIBRARIES = kodak_ez200.la - -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-files b/camlibs/konica/Makefile-files new file mode 100644 index 000000000..32ede2e5c --- /dev/null +++ b/camlibs/konica/Makefile-files @@ -0,0 +1,25 @@ +EXTRA_DIST += konica/EXPERTS konica/qm150.txt konica/README.konica +camlibdoc_DATA += konica/README.konica + +konica_defs = \ + -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\" + +EXTRA_LTLIBRARIES += konica.la + +konica_la_SOURCES = \ + konica/lowlevel.c konica/lowlevel.h \ + konica/konica.c konica/konica.h \ + konica/library.c +konica_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS) +konica_la_LDFLAGS = $(camlib_ldflags) +konica_la_DEPENDENCIES = $(camlib_dependencies) +konica_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += konica_qm150.la + +konica_qm150_la_SOURCES = konica/qm150.c +konica_qm150_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS) +konica_qm150_la_LDFLAGS = $(camlib_ldflags) +konica_qm150_la_DEPENDENCIES = $(camlib_dependencies) +konica_qm150_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am deleted file mode 100644 index b05f0fd56..000000000 --- a/camlibs/konica/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -SUBDIRS = localization - -camlib_LTLIBRARIES = konica.la konica_qm150.la - -EXTRA_DIST = EXPERTS qm150.txt README.konica - -DEFS = \ - -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\" - -konica_la_SOURCES = \ - lowlevel.c lowlevel.h \ - konica.c konica.h \ - library.c - -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 - -camlibdoc_DATA = README.konica diff --git a/camlibs/largan/lmini/Makefile-files b/camlibs/largan/lmini/Makefile-files new file mode 100644 index 000000000..a04075d68 --- /dev/null +++ b/camlibs/largan/lmini/Makefile-files @@ -0,0 +1,12 @@ +EXTRA_DIST += largan/lmini/README.largan-lmini +camlibdoc_DATA += largan/lmini/README.largan-lmini + +EXTRA_LTLIBRARIES += largan.la + +largan_la_SOURCES = \ + largan/lmini/largan.c \ + largan/lmini/lmini.c largan/lmini/lmini.h \ + largan/lmini/lmini_ccd.c largan/lmini/lmini_ccd.h +largan_la_LDFLAGS = $(camlib_ldflags) +largan_la_DEPENDENCIES = $(camlib_dependencies) +largan_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/largan/lmini/Makefile.am b/camlibs/largan/lmini/Makefile.am deleted file mode 100644 index 24b34c8e5..000000000 --- a/camlibs/largan/lmini/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.largan-lmini -EXTRA_DIST = README.largan-lmini diff --git a/camlibs/lg_gsm/Makefile-files b/camlibs/lg_gsm/Makefile-files new file mode 100644 index 000000000..3ac799a12 --- /dev/null +++ b/camlibs/lg_gsm/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += lg_gsm/README.lg_gsm +camlibdoc_DATA += lg_gsm/README.lg_gsm + +EXTRA_LTLIBRARIES += lg_gsm.la + +lg_gsm_la_SOURCES = lg_gsm/library.c lg_gsm/lg_gsm.c lg_gsm/lg_gsm.h +lg_gsm_la_LDFLAGS = $(camlib_ldflags) +lg_gsm_la_DEPENDENCIES = $(camlib_dependencies) +lg_gsm_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/lg_gsm/Makefile.am b/camlibs/lg_gsm/Makefile.am deleted file mode 100644 index 705098269..000000000 --- a/camlibs/lg_gsm/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.lg_gsm -EXTRA_DIST = README.lg_gsm diff --git a/camlibs/mars/Makefile-files b/camlibs/mars/Makefile-files new file mode 100644 index 000000000..7a76db9f3 --- /dev/null +++ b/camlibs/mars/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += mars/protocol.txt mars/README.mars +camlibdoc_DATA += mars/README.mars + +EXTRA_LTLIBRARIES += mars.la + +mars_la_SOURCES = mars/library.c mars/mars.c mars/mars.h +mars_la_LDFLAGS = $(camlib_ldflags) +mars_la_DEPENDENCIES = $(camlib_dependencies) +mars_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/mars/Makefile.am b/camlibs/mars/Makefile.am deleted file mode 100644 index cd04b0d77..000000000 --- a/camlibs/mars/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = mars.la - -EXTRA_DIST = protocol.txt README.mars - -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 - -camlibdoc_DATA = README.mars diff --git a/camlibs/minolta/Makefile-files b/camlibs/minolta/Makefile-files new file mode 100644 index 000000000..55aedaf02 --- /dev/null +++ b/camlibs/minolta/Makefile-files @@ -0,0 +1 @@ +EXTRA_DIST += minolta/NEWER_MINOLTAS diff --git a/camlibs/minolta/Makefile.am b/camlibs/minolta/Makefile.am deleted file mode 100644 index 10274ddfd..000000000 --- a/camlibs/minolta/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to generate a GNU Makefile - -SUBDIRS = dimagev - -EXTRA_DIST = NEWER_MINOLTAS diff --git a/camlibs/minolta/dimagev/Makefile-files b/camlibs/minolta/dimagev/Makefile-files new file mode 100644 index 000000000..39604fd48 --- /dev/null +++ b/camlibs/minolta/dimagev/Makefile-files @@ -0,0 +1,20 @@ +EXTRA_DIST += minolta/dimagev/README.minolta-dimagev +camlibdoc_DATA += minolta/dimagev/README.minolta-dimagev + +EXTRA_LTLIBRARIES += dimagev.la + +dimagev_la_SOURCES = \ + minolta/dimagev/capture.c \ + minolta/dimagev/data.c \ + minolta/dimagev/delete.c \ + minolta/dimagev/dimagev.c \ + minolta/dimagev/dimagev.h \ + minolta/dimagev/download.c \ + minolta/dimagev/info.c \ + minolta/dimagev/packet.c \ + minolta/dimagev/status.c \ + minolta/dimagev/upload.c \ + minolta/dimagev/util.c +dimagev_la_LDFLAGS = $(camlib_ldflags) +dimagev_la_DEPENDENCIES = $(camlib_dependencies) +dimagev_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am deleted file mode 100644 index 72b0cc5e4..000000000 --- a/camlibs/minolta/dimagev/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = dimagev.la - -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 - -camlibdoc_DATA = README.minolta-dimagev -EXTRA_DIST = README.minolta-dimagev diff --git a/camlibs/mustek/Makefile-files b/camlibs/mustek/Makefile-files new file mode 100644 index 000000000..59a02680e --- /dev/null +++ b/camlibs/mustek/Makefile-files @@ -0,0 +1,12 @@ +EXTRA_DIST += mustek/AUTHOR mustek/README.mustek +camlibdoc_DATA += mustek/README.mustek + +EXTRA_LTLIBRARIES += mustek.la + +mustek_la_SOURCES = \ + mustek/mdc800.c mustek/core.c mustek/image.c \ + mustek/io.c mustek/rs232.c mustek/usb.c mustek/core.h mustek/image.h \ + mustek/io.h mustek/mdc800_spec.h mustek/print.h mustek/rs232.h mustek/usb.h +mustek_la_LDFLAGS = $(camlib_ldflags) +mustek_la_DEPENDENCIES = $(camlib_dependencies) +mustek_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/mustek/Makefile.am b/camlibs/mustek/Makefile.am deleted file mode 100644 index 0cb409b9b..000000000 --- a/camlibs/mustek/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -camlib_LTLIBRARIES = mustek.la - -EXTRA_DIST = AUTHOR README.mustek - -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_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -mustek_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la - -camlibdoc_DATA = README.mustek diff --git a/camlibs/panasonic/Makefile-files b/camlibs/panasonic/Makefile-files new file mode 100644 index 000000000..0a1cc7307 --- /dev/null +++ b/camlibs/panasonic/Makefile-files @@ -0,0 +1,22 @@ +# SUBDIRS = coolshot l859 +EXTRA_DIST += panasonic/README.panasonic +camlibdoc_DATA += panasonic/README.panasonic + +EXTRA_LTLIBRARIES += panasonic_dc1000.la + +panasonic_dc1000_la_SOURCES = \ + panasonic/dc1000.c panasonic/dc1000.h \ + panasonic/dc.c panasonic/dc.h +panasonic_dc1000_la_LDFLAGS = $(camlib_ldflags) +panasonic_dc1000_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_dc1000_la_LIBADD = $(camlib_libadd) + +EXTRA_LTLIBRARIES += panasonic_dc1580.la + +panasonic_dc1580_la_SOURCES = \ + panasonic/dc1580.c panasonic/dc1580.h \ + panasonic/dc.c panasonic/dc.h \ + panasonic/dc1000.h +panasonic_dc1580_la_LDFLAGS = $(camlib_ldflags) +panasonic_dc1580_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_dc1580_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am deleted file mode 100644 index a4e427515..000000000 --- a/camlibs/panasonic/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -SUBDIRS = coolshot l859 - -camlib_LTLIBRARIES =\ - panasonic_dc1000.la\ - panasonic_dc1580.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_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 - -camlibdoc_DATA = README.panasonic -EXTRA_DIST = README.panasonic diff --git a/camlibs/panasonic/coolshot/Makefile-files b/camlibs/panasonic/coolshot/Makefile-files new file mode 100644 index 000000000..13a771a9a --- /dev/null +++ b/camlibs/panasonic/coolshot/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += panasonic/coolshot/README.panasonic-coolshot +camlibdoc_DATA += panasonic/coolshot/README.panasonic-coolshot + +EXTRA_LTLIBRARIES += panasonic_coolshot.la + +panasonic_coolshot_la_SOURCES = \ + panasonic/coolshot/coolshot.c \ + panasonic/coolshot/library.c panasonic/coolshot/library.h +panasonic_coolshot_la_LDFLAGS = $(camlib_ldflags) +panasonic_coolshot_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_coolshot_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am deleted file mode 100644 index 4c764aacb..000000000 --- a/camlibs/panasonic/coolshot/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.panasonic-coolshot -EXTRA_DIST = README.panasonic-coolshot diff --git a/camlibs/panasonic/l859/Makefile-files b/camlibs/panasonic/l859/Makefile-files new file mode 100644 index 000000000..2c766f5d4 --- /dev/null +++ b/camlibs/panasonic/l859/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += panasonic/l859/README.panasonic-l859 +camlibdoc_DATA += panasonic/l859/README.panasonic-l859 + +EXTRA_LTLIBRARIES += panasonic_l859.la + +panasonic_l859_la_SOURCES = panasonic/l859/l859.c panasonic/l859/l859.h +panasonic_l859_la_LDFLAGS = $(camlib_ldflags) +panasonic_l859_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_l859_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am deleted file mode 100644 index 925fbef85..000000000 --- a/camlibs/panasonic/l859/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.panasonic-l859 -EXTRA_DIST = README.panasonic-l859 diff --git a/camlibs/pccam300/Makefile-files b/camlibs/pccam300/Makefile-files new file mode 100644 index 000000000..585d44c9e --- /dev/null +++ b/camlibs/pccam300/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += pccam300/README.pccam300 +camlibdoc_DATA += pccam300/README.pccam300 + +EXTRA_LTLIBRARIES += pccam300.la + +pccam300_la_SOURCES = pccam300/pccam300.c pccam300/pccam300.h pccam300/library.c +pccam300_la_LDFLAGS = $(camlib_ldflags) +pccam300_la_DEPENDENCIES = $(camlib_dependencies) +pccam300_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/pccam300/Makefile.am b/camlibs/pccam300/Makefile.am deleted file mode 100644 index f0555fbf0..000000000 --- a/camlibs/pccam300/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.pccam300 -EXTRA_DIST = README.pccam300 diff --git a/camlibs/pccam600/Makefile-files b/camlibs/pccam600/Makefile-files new file mode 100644 index 000000000..86ebf87ae --- /dev/null +++ b/camlibs/pccam600/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += pccam600/README.pccam600 +camlibdoc_DATA += pccam600/README.pccam600 + +EXTRA_LTLIBRARIES += pccam600.la + +pccam600_la_SOURCES = pccam600/pccam600.c pccam600/pccam600.h pccam600/library.c +pccam600_la_LDFLAGS = $(camlib_ldflags) +pccam600_la_DEPENDENCIES = $(camlib_dependencies) +pccam600_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/pccam600/Makefile.am b/camlibs/pccam600/Makefile.am deleted file mode 100644 index b7d60349b..000000000 --- a/camlibs/pccam600/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.pccam600 -EXTRA_DIST = README.pccam600 diff --git a/camlibs/polaroid/Makefile-files b/camlibs/polaroid/Makefile-files new file mode 100644 index 000000000..0eefd9b57 --- /dev/null +++ b/camlibs/polaroid/Makefile-files @@ -0,0 +1,29 @@ +EXTRA_DIST += polaroid/jpeg.txt polaroid/jpeghead.h \ + polaroid/pdc320.html polaroid/gt98x.html + + +EXTRA_LTLIBRARIES += polaroid_pdc320.la + +polaroid_pdc320_la_SOURCES = polaroid/pdc320.c polaroid/pdc320.h +polaroid_pdc320_la_LDFLAGS = $(camlib_ldflags) +polaroid_pdc320_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc320_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += polaroid_pdc640.la + +polaroid_pdc640_la_SOURCES = polaroid/pdc640.c \ + polaroid/jd350e.h polaroid/jd350e.c \ + polaroid/jd350e_red.h polaroid/jd350e_blue.h \ + polaroid/dlink350f.c polaroid/dlink350f.h +polaroid_pdc640_la_LDFLAGS = $(camlib_ldflags) +polaroid_pdc640_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc640_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += polaroid_pdc700.la + +polaroid_pdc700_la_SOURCES = polaroid/pdc700.c +polaroid_pdc700_la_LDFLAGS = $(camlib_ldflags) +polaroid_pdc700_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc700_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am deleted file mode 100644 index 0797961e7..000000000 --- a/camlibs/polaroid/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_DIST = jpeg.txt jpeghead.h pdc320.html gt98x.html - -camlib_LTLIBRARIES = \ - polaroid_pdc320.la \ - polaroid_pdc640.la \ - polaroid_pdc700.la - - -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 - - -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-files b/camlibs/ptp2/Makefile-files new file mode 100644 index 000000000..adbff20cd --- /dev/null +++ b/camlibs/ptp2/Makefile-files @@ -0,0 +1,13 @@ +EXTRA_DIST += ptp2/ptp-pack.c ptp2/PTPIP.TXT ptp2/README.ptp2 \ + ptp2/TODO ptp2/ChangeLog ptp2/ptpip.html +camlibdoc_DATA += ptp2/README.ptp2 + +EXTRA_LTLIBRARIES += ptp2.la + +ptp2_la_SOURCES = \ + ptp2/ptp.c ptp2/ptp.h \ + ptp2/library.c ptp2/ptp-bugs.h \ + ptp2/ptp-private.h ptp2/ptpip.c ptp2/config.c +ptp2_la_LDFLAGS = $(camlib_ldflags) +ptp2_la_DEPENDENCIES = $(camlib_dependencies) +ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) diff --git a/camlibs/ptp2/Makefile.am b/camlibs/ptp2/Makefile.am deleted file mode 100644 index 16f7225bc..000000000 --- a/camlibs/ptp2/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = ptp-pack.c PTPIP.TXT README.ptp2 TODO ChangeLog ptpip.html - -camlib_LTLIBRARIES = ptp2.la - -ptp2_la_SOURCES = ptp.c ptp.h library.c ptp-bugs.h ptp-private.h ptpip.c config.c -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 $(LTLIBICONV) - -camlibdoc_DATA = README.ptp2 diff --git a/camlibs/ricoh/Makefile-files b/camlibs/ricoh/Makefile-files new file mode 100644 index 000000000..2d51551b5 --- /dev/null +++ b/camlibs/ricoh/Makefile-files @@ -0,0 +1,17 @@ +EXTRA_DIST += ricoh/g3.txt + + +EXTRA_LTLIBRARIES += ricoh.la + +ricoh_la_SOURCES = ricoh/library.c ricoh/ricoh.c ricoh/ricoh.h ricoh/crctab.h +ricoh_la_LDFLAGS = $(camlib_ldflags) +ricoh_la_DEPENDENCIES = $(camlib_dependencies) +ricoh_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += ricoh_g3.la + +ricoh_g3_la_SOURCES = ricoh/g3.c +ricoh_g3_la_LDFLAGS = $(camlib_ldflags) +ricoh_g3_la_DEPENDENCIES = $(camlib_dependencies) +ricoh_g3_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/ricoh/Makefile.am b/camlibs/ricoh/Makefile.am deleted file mode 100644 index 13321697d..000000000 --- a/camlibs/ricoh/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -camlib_LTLIBRARIES = ricoh.la ricoh_g3.la - -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-files b/camlibs/samsung/Makefile-files new file mode 100644 index 000000000..315e001d7 --- /dev/null +++ b/camlibs/samsung/Makefile-files @@ -0,0 +1,6 @@ +EXTRA_LTLIBRARIES += samsung.la + +samsung_la_SOURCES = samsung/samsung.c +samsung_la_LDFLAGS = $(camlib_ldflags) +samsung_la_DEPENDENCIES = $(camlib_dependencies) +samsung_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am deleted file mode 100644 index 487880f18..000000000 --- a/camlibs/samsung/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/sierra/Makefile-files new file mode 100644 index 000000000..bb36cf88d --- /dev/null +++ b/camlibs/sierra/Makefile-files @@ -0,0 +1,14 @@ +EXTRA_DIST += sierra/PROTOCOL + +EXTRA_LTLIBRARIES += sierra.la + +sierra_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) +sierra_la_SOURCES = \ + sierra/sierra.c sierra/sierra.h \ + sierra/library.c sierra/library.h \ + sierra/sierra-usbwrap.c sierra/sierra-usbwrap.h \ + sierra/sierra-desc.h sierra/sierra-desc.c \ + sierra/nikon-desc.c sierra/olympus-desc.c sierra/epson-desc.c +sierra_la_LDFLAGS = $(camlib_ldflags) +sierra_la_DEPENDENCIES = $(camlib_dependencies) +sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS) diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am deleted file mode 100644 index 8b4243a1b..000000000 --- a/camlibs/sierra/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -EXTRA_DIST = PROTOCOL - -camlib_LTLIBRARIES = sierra.la - -sierra_la_CPPFLAGS = $(AM_CPPFLAGS) $(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_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS) diff --git a/camlibs/sipix/Makefile-files b/camlibs/sipix/Makefile-files new file mode 100644 index 000000000..916b0b1b5 --- /dev/null +++ b/camlibs/sipix/Makefile-files @@ -0,0 +1,26 @@ +EXTRA_DIST += sipix/web2.html sipix/blink.c sipix/blink.txt \ + sipix/xjpeg.c sipix/blink2.txt + +# Seems to be obsolete +EXTRA_LTLIBRARIES += sipix_blink.la + +sipix_blink_la_SOURCES = sipix/blink.c +sipix_blink_la_LDFLAGS = $(camlib_ldflags) +sipix_blink_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += sipix_blink2.la + +sipix_blink2_la_SOURCES = sipix/blink2.c +sipix_blink2_la_LDFLAGS = $(camlib_ldflags) +sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink2_la_LIBADD = $(camlib_libadd) @LIBJPEG@ + + +EXTRA_LTLIBRARIES += sipix_web2.la + +sipix_web2_la_SOURCES = sipix/web2.c +sipix_web2_la_LDFLAGS = $(camlib_ldflags) +sipix_web2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_web2_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sipix/Makefile.am b/camlibs/sipix/Makefile.am deleted file mode 100644 index 9d532c76d..000000000 --- a/camlibs/sipix/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -camlib_LTLIBRARIES = \ - sipix_blink2.la \ - sipix_web2.la - -EXTRA_DIST = web2.html blink.c 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-files b/camlibs/smal/Makefile-files new file mode 100644 index 000000000..1e3fcaf54 --- /dev/null +++ b/camlibs/smal/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += smal/README.smal +camlibdoc_DATA += smal/README.smal + +EXTRA_LTLIBRARIES += smal.la + +smal_la_SOURCES = \ + smal/smal.c smal/ultrapocket.c \ + smal/smal.h smal/ultrapocket.h +smal_la_LDFLAGS = $(camlib_ldflags) +smal_la_DEPENDENCIES = $(camlib_dependencies) +smal_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/smal/Makefile.am b/camlibs/smal/Makefile.am deleted file mode 100644 index f31581b5a..000000000 --- a/camlibs/smal/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.smal -EXTRA_DIST = README.smal diff --git a/camlibs/sonix/Makefile-files b/camlibs/sonix/Makefile-files new file mode 100644 index 000000000..760fe5d3d --- /dev/null +++ b/camlibs/sonix/Makefile-files @@ -0,0 +1,12 @@ +EXTRA_DIST += sonix/README.sonix +camlibdoc_DATA += sonix/README.sonix + +EXTRA_LTLIBRARIES += sonix.la + +sonix_la_SOURCES = \ + sonix/library.c \ + sonix/sonix.c sonix/sonix.h \ + sonix/sakar-avi-header.h +sonix_la_LDFLAGS = $(camlib_ldflags) +sonix_la_DEPENDENCIES = $(camlib_dependencies) +sonix_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonix/Makefile.am b/camlibs/sonix/Makefile.am deleted file mode 100644 index 437c60908..000000000 --- a/camlibs/sonix/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -camlib_LTLIBRARIES = sonix.la - -sonix_la_SOURCES = library.c sonix.c sonix.h sakar-avi-header.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 - -camlibdoc_DATA = README.sonix -EXTRA_DIST = README.sonix diff --git a/camlibs/sonydscf1/Makefile-files b/camlibs/sonydscf1/Makefile-files new file mode 100644 index 000000000..0d7d08cd6 --- /dev/null +++ b/camlibs/sonydscf1/Makefile-files @@ -0,0 +1,15 @@ +EXTRA_DIST += sonydscf1/README.sonydscf1 sonydscf1/todo +camlibdoc_DATA += sonydscf1/README.sonydscf1 + +EXTRA_LTLIBRARIES += sony_dscf1.la + +EXTRA_sony_dscf1_la_SOURCES = sonydscf1/dsc_f1.c +sony_dscf1_la_SOURCES = \ + sonydscf1/command.c sonydscf1/getuint.c sonydscf1/chotplay.c \ + sonydscf1/command.h sonydscf1/getuint.h sonydscf1/chotplay.h \ + sonydscf1/sonydscf1.c sonydscf1/sonydscf1.h \ + sonydscf1/pmp.h sonydscf1/common.h +sony_dscf1_la_LDFLAGS = $(camlib_ldflags) +sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies) +sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la + diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am deleted file mode 100644 index 41a521eec..000000000 --- a/camlibs/sonydscf1/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -EXTRA_DIST = README.sonydscf1 todo - -camlib_LTLIBRARIES = sony_dscf1.la - -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 -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 - -camlibdoc_DATA = README.sonydscf1 diff --git a/camlibs/sonydscf55/Makefile-files b/camlibs/sonydscf55/Makefile-files new file mode 100644 index 000000000..1dd1373d1 --- /dev/null +++ b/camlibs/sonydscf55/Makefile-files @@ -0,0 +1,8 @@ +EXTRA_LTLIBRARIES += sony_dscf55.la + +sony_dscf55_la_SOURCES = \ + sonydscf55/sony.c sonydscf55/sony.h \ + sonydscf55/camera.c sonydscf55/nls.h +sony_dscf55_la_LDFLAGS = $(camlib_ldflags) +sony_dscf55_la_DEPENDENCIES = $(camlib_dependencies) +sony_dscf55_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonydscf55/Makefile.am b/camlibs/sonydscf55/Makefile.am deleted file mode 100644 index a018d5bcb..000000000 --- a/camlibs/sonydscf55/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/soundvision/Makefile-files new file mode 100644 index 000000000..c9d0e8986 --- /dev/null +++ b/camlibs/soundvision/Makefile-files @@ -0,0 +1,13 @@ +EXTRA_DIST += soundvision/README.soundvision +camlibdoc_DATA += soundvision/README.soundvision + +EXTRA_LTLIBRARIES += soundvision.la + +soundvision_la_SOURCES = \ + soundvision/soundvision.c soundvision/agfa_cl18.c \ + soundvision/tiger_fastflicks.c \ + soundvision/commands.c soundvision/commands.h \ + soundvision/soundvision.h +soundvision_la_LDFLAGS = $(camlib_ldflags) +soundvision_la_DEPENDENCIES = $(camlib_dependencies) +soundvision_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/soundvision/Makefile.am b/camlibs/soundvision/Makefile.am deleted file mode 100644 index 65ddf574e..000000000 --- a/camlibs/soundvision/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -camlib_LTLIBRARIES = soundvision.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_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -soundvision_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la - -camlibdoc_DATA = README.soundvision -EXTRA_DIST = README.soundvision diff --git a/camlibs/spca50x/Makefile-files b/camlibs/spca50x/Makefile-files new file mode 100644 index 000000000..470a215ed --- /dev/null +++ b/camlibs/spca50x/Makefile-files @@ -0,0 +1,16 @@ +EXTRA_DIST += spca50x/ChangeLog.benq spca50x/ChangeLog.gsmart spca50x/ChangeLog.spca504_flash spca50x/lsusb-v spca50x/README.spca50x + +camlibdoc_DATA += spca50x/README.spca50x + +EXTRA_LTLIBRARIES += spca50x.la + +spca50x_la_SOURCES = \ + spca50x/spca50x.c spca50x/spca50x.h \ + spca50x/spca50x-flash.c spca50x/spca50x-flash.h \ + spca50x/spca50x-sdram.c spca50x/spca50x-sdram.h \ + spca50x/library.c \ + spca50x/spca50x-jpeg-header.h spca50x/spca50x-registers.h \ + spca50x/spca50x-avi-header.h +spca50x_la_LDFLAGS = $(camlib_ldflags) +spca50x_la_DEPENDENCIES = $(camlib_dependencies) +spca50x_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/spca50x/Makefile.am b/camlibs/spca50x/Makefile.am deleted file mode 100644 index d1793697b..000000000 --- a/camlibs/spca50x/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -camlib_LTLIBRARIES = spca50x.la - -EXTRA_DIST = ChangeLog.benq ChangeLog.gsmart ChangeLog.spca504_flash lsusb-v README.spca50x - -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_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym -spca50x_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la - -camlibdoc_DATA = README.spca50x diff --git a/camlibs/sq905/Makefile-files b/camlibs/sq905/Makefile-files new file mode 100644 index 000000000..5e7244c69 --- /dev/null +++ b/camlibs/sq905/Makefile-files @@ -0,0 +1,9 @@ +EXTRA_DIST += sq905/README.913C sq905/README.sq905 +camlibdoc_DATA += sq905/README.913C sq905/README.sq905 + +EXTRA_LTLIBRARIES += sq905.la + +sq905_la_SOURCES = sq905/library.c sq905/sq905.c sq905/sq905.h sq905/postprocess.c +sq905_la_LDFLAGS = $(camlib_ldflags) +sq905_la_DEPENDENCIES = $(camlib_dependencies) +sq905_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sq905/Makefile.am b/camlibs/sq905/Makefile.am deleted file mode 100644 index 622d2a6c3..000000000 --- a/camlibs/sq905/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.913C README.sq905 -EXTRA_DIST = README.913C README.sq905 diff --git a/camlibs/stv0674/Makefile-files b/camlibs/stv0674/Makefile-files new file mode 100644 index 000000000..cb7cb8d10 --- /dev/null +++ b/camlibs/stv0674/Makefile-files @@ -0,0 +1,10 @@ +EXTRA_DIST += stv0674/Protocol stv0674/Changelog + +EXTRA_LTLIBRARIES += stv0674.la + +stv0674_la_SOURCES = \ + stv0674/stv0674.c stv0674/stv0674.h \ + stv0674/library.c stv0674/library.h +stv0674_la_LDFLAGS = $(camlib_ldflags) +stv0674_la_DEPENDENCIES = $(camlib_dependencies) +stv0674_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/stv0674/Makefile.am b/camlibs/stv0674/Makefile.am deleted file mode 100644 index 3dd56dd5f..000000000 --- a/camlibs/stv0674/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST = Protocol Changelog - -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-files b/camlibs/stv0680/Makefile-files new file mode 100644 index 000000000..3f1d6176e --- /dev/null +++ b/camlibs/stv0680/Makefile-files @@ -0,0 +1,17 @@ +EXTRA_DIST += \ + stv0680/CREDITS stv0680/LICENCE \ + stv0680/README.pdf \ + stv0680/680_commands_and_communication_sdk.pdf.gz + +EXTRA_LTLIBRARIES += stv0680.la + +stv0680_la_SOURCES = \ + stv0680/stv0680.c stv0680/stv0680.h \ + stv0680/library.c stv0680/library.h \ + stv0680/bayer.c stv0680/bayer.h \ + stv0680/sharpen.c stv0680/sharpen.h \ + stv0680/saturate.c stv0680/saturate.h \ + stv0680/demosaic_sharpen.h stv0680/demosaic_sharpen.c +stv0680_la_LDFLAGS = $(camlib_ldflags) +stv0680_la_DEPENDENCIES = $(camlib_dependencies) +stv0680_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am deleted file mode 100644 index a9118ba52..000000000 --- a/camlibs/stv0680/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = CREDITS LICENCE README.pdf 680_commands_and_communication_sdk.pdf.gz - -camlib_LTLIBRARIES = stv0680.la - -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_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-files b/camlibs/sx330z/Makefile-files new file mode 100644 index 000000000..faa216879 --- /dev/null +++ b/camlibs/sx330z/Makefile-files @@ -0,0 +1,6 @@ +EXTRA_LTLIBRARIES += sx330z.la + +sx330z_la_SOURCES = sx330z/library.c sx330z/sx330z.c sx330z/sx330z.h +sx330z_la_LDFLAGS = $(camlib_ldflags) +sx330z_la_DEPENDENCIES = $(camlib_dependencies) +sx330z_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sx330z/Makefile.am b/camlibs/sx330z/Makefile.am deleted file mode 100644 index 23e8eec8c..000000000 --- a/camlibs/sx330z/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -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-files b/camlibs/template/Makefile-files new file mode 100644 index 000000000..ec3bef52b --- /dev/null +++ b/camlibs/template/Makefile-files @@ -0,0 +1,22 @@ +# If you use this as template for a real camlib (say 'foobar.la'), +# make sure to change the "noinst_" at the beginning of the following +# lines: +# * "noinst_DATA" into "camlibdoc_DATA" +# * "noinst_LTLIBRARIES" into "EXTRA_LTLIBRARIES" +# +# Additionally, you must add add an include line to the Makefile-files +# of the new camlib to camlibs/Makefile.am: +# * "include my-new-camlib/Makefile-files" +# +# And as the last step, you need to add it to configure.ac: +# * GP_CAMLIB([foobar])dnl + +EXTRA_DIST += template/README.template + +noinst_DATA += template/README.template +noinst_LTLIBRARIES += template.la + +template_la_SOURCES = template/template.c +template_la_LDFLAGS = $(camlib_ldflags) +template_la_DEPENDENCIES = $(camlib_dependencies) +template_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am deleted file mode 100644 index ce99dc663..000000000 --- a/camlibs/template/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# If you use this as template for a real camlib, make sure to -# change the "noinst_" at the beginning of the following line -# into "camlib_". -noinst_LTLIBRARIES = template.la -#camlib_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 - -noinst_DATA = README.template -EXTRA_DIST = README.template - diff --git a/camlibs/toshiba/pdrm11/Makefile-files b/camlibs/toshiba/pdrm11/Makefile-files new file mode 100644 index 000000000..6d0ad434d --- /dev/null +++ b/camlibs/toshiba/pdrm11/Makefile-files @@ -0,0 +1,11 @@ +EXTRA_DIST += toshiba/pdrm11/README.toshiba-pdrm11 +camlibdoc_DATA += toshiba/pdrm11/README.toshiba-pdrm11 + +EXTRA_LTLIBRARIES += toshiba_pdrm11.la + +toshiba_pdrm11_la_SOURCES = \ + toshiba/pdrm11/library.c \ + toshiba/pdrm11/pdrm11.c toshiba/pdrm11/pdrm11.h +toshiba_pdrm11_la_LDFLAGS = $(camlib_ldflags) +toshiba_pdrm11_la_DEPENDENCIES = $(camlib_dependencies) +toshiba_pdrm11_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/toshiba/pdrm11/Makefile.am b/camlibs/toshiba/pdrm11/Makefile.am deleted file mode 100644 index 89a8db338..000000000 --- a/camlibs/toshiba/pdrm11/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 - -camlibdoc_DATA = README.toshiba-pdrm11 -EXTRA_DIST = README.toshiba-pdrm11 |