diff options
66 files changed, 1342 insertions, 695 deletions
diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am index 8bc0affa8..c71aad128 100644 --- a/camlibs/Makefile.am +++ b/camlibs/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS = . ######################################################################## # Define the common variables added to in the included Makefile-files CLEANFILES = -EXTRA_DIST = camlib.sym +EXTRA_DIST = camlibdoc_DATA = localization_DATA = localizationdir = @@ -59,22 +59,30 @@ camlib_LTLIBRARIES = $(INSTALL_THESE_CAMLIBS) # i.e. here. camlib_dependencies = -camlib_dependencies += $(top_srcdir)/camlibs/camlib.sym camlib_ldflags = camlib_ldflags += -module camlib_ldflags += -no-undefined camlib_ldflags += -avoid-version camlib_ldflags += -export-dynamic -camlib_ldflags += -export-symbols '$(top_srcdir)/camlibs/camlib.sym' + +EXTRA_DIST += camlib.sym +camlib_dependencies += $(top_srcdir)/camlibs/camlib.sym +camlib_ldflags += -export-symbols '$(top_srcdir)/camlibs/camlib.sym' + camlib_ldflags += -rpath '$(camlibdir)' camlib_libadd = camlib_libadd += $(top_builddir)/libgphoto2/libgphoto2.la camlib_libadd += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la -AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -AM_CPPFLAGS += -I$(top_srcdir)/libgphoto2_port +camlib_cflags = + +camlib_cppflags = +camlib_cppflags += $(AM_CPPFLAGS) +camlib_cppflags += -I$(top_srcdir) +camlib_cppflags += -I$(top_builddir) +camlib_cppflags += -I$(top_srcdir)/libgphoto2_port ######################################################################## diff --git a/camlibs/adc65/Makefile-files b/camlibs/adc65/Makefile-files index 41973d7d7..9dea568d1 100644 --- a/camlibs/adc65/Makefile-files +++ b/camlibs/adc65/Makefile-files @@ -1,11 +1,19 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += adc65/README.adc65 adc65/TODO adc65/Changelog -camlibdoc_DATA += adc65/README.adc65 +EXTRA_DIST += %reldir%/Changelog -EXTRA_LTLIBRARIES += adc65.la +EXTRA_DIST += %reldir%/README.adc65 +camlibdoc_DATA += %reldir%/README.adc65 -adc65_la_SOURCES = adc65/adc65.c -adc65_la_LDFLAGS = $(camlib_ldflags) -adc65_la_DEPENDENCIES = $(camlib_dependencies) -adc65_la_LIBADD = $(camlib_libadd) +EXTRA_DIST += %reldir%/TODO + + +EXTRA_LTLIBRARIES += adc65.la + +adc65_la_SOURCES = %reldir%/adc65.c + +adc65_la_CFLAGS = $(camlib_cflags) +adc65_la_CPPFLAGS = $(camlib_cppflags) +adc65_la_DEPENDENCIES = $(camlib_dependencies) +adc65_la_LDFLAGS = $(camlib_ldflags) +adc65_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/agfa-cl20/Makefile-files b/camlibs/agfa-cl20/Makefile-files index 2978ddbc1..e3f3ada9f 100644 --- a/camlibs/agfa-cl20/Makefile-files +++ b/camlibs/agfa-cl20/Makefile-files @@ -1,17 +1,24 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -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 +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/RANDOM -camlibdoc_DATA += agfa-cl20/README.agfa-cl20 +EXTRA_DIST += %reldir%/README.agfa-cl20 +camlibdoc_DATA += %reldir%/README.agfa-cl20 -EXTRA_LTLIBRARIES += agfa_cl20.la +EXTRA_DIST += %reldir%/STATUS +EXTRA_DIST += %reldir%/commands.txt +EXTRA_DIST += %reldir%/pic-header.txt +EXTRA_DIST += %reldir%/protocol.txt +EXTRA_DIST += %reldir%/protocol2.txt -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) + +EXTRA_LTLIBRARIES += agfa_cl20.la + +agfa_cl20_la_SOURCES = %reldir%/agfa_cl20.c + +agfa_cl20_la_CFLAGS = $(camlib_cflags) +agfa_cl20_la_CPPFLAGS = $(camlib_cppflags) +agfa_cl20_la_DEPENDENCIES = $(camlib_dependencies) +agfa_cl20_la_LDFLAGS = $(camlib_ldflags) +agfa_cl20_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/aox/Makefile-files b/camlibs/aox/Makefile-files index 29565502b..6d89e077c 100644 --- a/camlibs/aox/Makefile-files +++ b/camlibs/aox/Makefile-files @@ -1,11 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += aox.la -camlibdoc_DATA += aox/README.aox +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_DIST += aox/README.aox aox/ChangeLog +EXTRA_DIST += %reldir%/README.aox +camlibdoc_DATA += %reldir%/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) + +EXTRA_LTLIBRARIES += aox.la + +aox_la_SOURCES = +aox_la_SOURCES += %reldir%/library.c +aox_la_SOURCES += %reldir%/aox.c +aox_la_SOURCES += %reldir%/aox.h + +aox_la_CFLAGS = $(camlib_cflags) +aox_la_CPPFLAGS = $(camlib_cppflags) +aox_la_DEPENDENCIES = $(camlib_dependencies) +aox_la_LDFLAGS = $(camlib_ldflags) +aox_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/ax203/Makefile-files b/camlibs/ax203/Makefile-files index 14cd0be7d..2b64bf234 100644 --- a/camlibs/ax203/Makefile-files +++ b/camlibs/ax203/Makefile-files @@ -1,12 +1,36 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += ax203/README.ax203-compression ax203/README.ax203 -camlibdoc_DATA += ax203/README.ax203-compression ax203/README.ax203 +EXTRA_DIST += %reldir%/README.ax203-compression +camlibdoc_DATA += %reldir%/README.ax203-compression -EXTRA_LTLIBRARIES += ax203.la +EXTRA_DIST += %reldir%/README.ax203 +camlibdoc_DATA += %reldir%/README.ax203 -ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h ax203/tinyjpeg-internal.h ax203/jidctflt.c -ax203_la_LDFLAGS = $(camlib_ldflags) -ax203_la_DEPENDENCIES = $(camlib_dependencies) -ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LIBJPEG_LIBS) -ax203_la_CFLAGS = @LIBGD_CFLAGS@ $(LIBJPEG_CFLAGS) + +EXTRA_LTLIBRARIES += ax203.la + +ax203_la_SOURCES = +ax203_la_SOURCES += %reldir%/library.c +ax203_la_SOURCES += %reldir%/ax203.c +ax203_la_SOURCES += %reldir%/ax203.h +ax203_la_SOURCES += %reldir%/ax203_decode_yuv.c +ax203_la_SOURCES += %reldir%/ax203_decode_yuv_delta.c +ax203_la_SOURCES += %reldir%/ax203_compress_jpeg.c +ax203_la_SOURCES += %reldir%/jpeg_memsrcdest.h +ax203_la_SOURCES += %reldir%/jpeg_memsrcdest.c +ax203_la_SOURCES += %reldir%/tinyjpeg.c +ax203_la_SOURCES += %reldir%/tinyjpeg.h +ax203_la_SOURCES += %reldir%/tinyjpeg-internal.h +ax203_la_SOURCES += %reldir%/jidctflt.c + +ax203_la_CFLAGS = $(camlib_cflags) +ax203_la_CPPFLAGS = $(camlib_cppflags) +ax203_la_DEPENDENCIES = $(camlib_dependencies) +ax203_la_LDFLAGS = $(camlib_ldflags) +ax203_la_LIBADD = $(camlib_libadd) + +ax203_la_LIBADD += @LIBGD_LIBS@ +ax203_la_CPPFLAGS += @LIBGD_CFLAGS@ + +ax203_la_LIBADD += $(LIBJPEG_LIBS) +ax203_la_CPPFLAGS += $(LIBJPEG_CFLAGS) diff --git a/camlibs/barbie/Makefile-files b/camlibs/barbie/Makefile-files index bee8e60bf..239b4e26a 100644 --- a/camlibs/barbie/Makefile-files +++ b/camlibs/barbie/Makefile-files @@ -1,9 +1,15 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += barbie/Protocol.txt barbie/ChangeLog -EXTRA_LTLIBRARIES += barbie.la +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/Protocol.txt -barbie_la_SOURCES = barbie/barbie.c -barbie_la_LDFLAGS = $(camlib_ldflags) -barbie_la_DEPENDENCIES = $(camlib_dependencies) -barbie_la_LIBADD = $(camlib_libadd) + +EXTRA_LTLIBRARIES += barbie.la + +barbie_la_SOURCES = %reldir%/barbie.c + +barbie_la_CFLAGS = $(camlib_cflags) +barbie_la_CPPFLAGS = $(camlib_cppflags) +barbie_la_DEPENDENCIES = $(camlib_dependencies) +barbie_la_LDFLAGS = $(camlib_ldflags) +barbie_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/canon/Makefile-files b/camlibs/canon/Makefile-files index fe02b85d0..e47392188 100644 --- a/camlibs/canon/Makefile-files +++ b/camlibs/canon/Makefile-files @@ -1,12 +1,15 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -SUBDIRS += canon/doc +SUBDIRS += %reldir%/doc -EXTRA_LTLIBRARIES += canon.la +EXTRA_DIST += %reldir%/.indent.pro +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/urb-interpret +EXTRA_DIST += %reldir%/TODO -camlibdoc_DATA += canon/README.canon +EXTRA_DIST += %reldir%/README.canon +camlibdoc_DATA += %reldir%/README.canon -EXTRA_DIST += canon/.indent.pro canon/ChangeLog canon/urb-interpret canon/README.canon canon/TODO # "ideal" version: # + only export the 3 symbols @@ -17,14 +20,29 @@ EXTRA_DIST += canon/.indent.pro canon/ChangeLog canon/urb-interpret canon/README # 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) + +EXTRA_LTLIBRARIES += canon.la + +canon_la_SOURCES = + +canon_la_SOURCES += %reldir%/canon.c +canon_la_SOURCES += %reldir%/canon.h +canon_la_SOURCES += %reldir%/library.c +canon_la_SOURCES += %reldir%/library.h +canon_la_SOURCES += %reldir%/serial.c +canon_la_SOURCES += %reldir%/serial.h +canon_la_SOURCES += %reldir%/usb.c +canon_la_SOURCES += %reldir%/usb.h +canon_la_SOURCES += %reldir%/crc.c +canon_la_SOURCES += %reldir%/crc.h +canon_la_SOURCES += %reldir%/util.c +canon_la_SOURCES += %reldir%/util.h + +canon_la_CFLAGS = $(camlib_cflags) +canon_la_CPPFLAGS = $(camlib_cppflags) +canon_la_DEPENDENCIES = $(camlib_dependencies) +canon_la_LDFLAGS = $(camlib_ldflags) +canon_la_LIBADD = $(camlib_libadd) + +canon_la_CPPFLAGS += $(LIBEXIF_CFLAGS) +canon_la_LIBADD += $(LIBEXIF_LIBS) diff --git a/camlibs/casio/Makefile-files b/camlibs/casio/Makefile-files index f1a6c6421..e670401e3 100644 --- a/camlibs/casio/Makefile-files +++ b/camlibs/casio/Makefile-files @@ -1,16 +1,24 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += casio/PROTOCOL.txt casio/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/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 +EXTRA_LTLIBRARIES += casio_qv.la -casio_qv_la_LDFLAGS = $(camlib_ldflags) -casio_qv_la_DEPENDENCIES = $(camlib_dependencies) -casio_qv_la_LIBADD = $(camlib_libadd) +casio_qv_la_SOURCES = +casio_qv_la_SOURCES += %reldir%/casio-qv.c +casio_qv_la_SOURCES += %reldir%/casio-qv-commands.c +casio_qv_la_SOURCES += %reldir%/casio-qv-commands.h +casio_qv_la_SOURCES += %reldir%/camtojpeg.c +casio_qv_la_SOURCES += %reldir%/camtojpeg.h +casio_qv_la_SOURCES += %reldir%/cam2jpgtab.h +casio_qv_la_SOURCES += %reldir%/jpegtab_f.h +casio_qv_la_SOURCES += %reldir%/ycctoppm.c +casio_qv_la_SOURCES += %reldir%/ycctoppm.h + +casio_qv_la_CFLAGS = $(camlib_cflags) +casio_qv_la_CPPFLAGS = $(camlib_cppflags) +casio_qv_la_DEPENDENCIES = $(camlib_dependencies) +casio_qv_la_LDFLAGS = $(camlib_ldflags) +casio_qv_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/clicksmart310/Makefile-files b/camlibs/clicksmart310/Makefile-files index 0b1eb5573..b39ec7782 100644 --- a/camlibs/clicksmart310/Makefile-files +++ b/camlibs/clicksmart310/Makefile-files @@ -1,13 +1,19 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += clicksmart310/README.clicksmart310 -camlibdoc_DATA += clicksmart310/README.clicksmart310 +EXTRA_DIST += %reldir%/README.clicksmart310 +camlibdoc_DATA += %reldir%/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) +EXTRA_LTLIBRARIES += clicksmart310.la + +clicksmart310_la_SOURCES = +clicksmart310_la_SOURCES += %reldir%/library.c +clicksmart310_la_SOURCES += %reldir%/clicksmart.c +clicksmart310_la_SOURCES += %reldir%/clicksmart.h +clicksmart310_la_SOURCES += %reldir%/spca50x-jpeg-header.h + +clicksmart310_la_CFLAGS = $(camlib_cflags) +clicksmart310_la_CPPFLAGS = $(camlib_cppflags) +clicksmart310_la_DEPENDENCIES = $(camlib_dependencies) +clicksmart310_la_LDFLAGS = $(camlib_ldflags) +clicksmart310_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/digigr8/Makefile-files b/camlibs/digigr8/Makefile-files index 8bea0bd64..3040d7c70 100644 --- a/camlibs/digigr8/Makefile-files +++ b/camlibs/digigr8/Makefile-files @@ -1,22 +1,33 @@ -# -*- Makefile -*- - -EXTRA_DIST += digigr8/README.905C -EXTRA_DIST += digigr8/README.9050 -EXTRA_DIST += digigr8/README.9051 -EXTRA_DIST += digigr8/README.9052 -EXTRA_DIST += digigr8/README.913D -EXTRA_DIST += digigr8/ChangeLog -camlibdoc_DATA += digigr8/README.905C -camlibdoc_DATA += digigr8/README.9050 -camlibdoc_DATA += digigr8/README.9051 -camlibdoc_DATA += digigr8/README.9052 -camlibdoc_DATA += digigr8/README.913D -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) +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/ChangeLog + +EXTRA_DIST += %reldir%/README.9050 +camlibdoc_DATA += %reldir%/README.9050 + +EXTRA_DIST += %reldir%/README.9051 +camlibdoc_DATA += %reldir%/README.9051 + +EXTRA_DIST += %reldir%/README.9052 +camlibdoc_DATA += %reldir%/README.9052 + +EXTRA_DIST += %reldir%/README.905C +camlibdoc_DATA += %reldir%/README.905C + +EXTRA_DIST += %reldir%/README.913D +camlibdoc_DATA += %reldir%/README.913D + + +EXTRA_LTLIBRARIES += digigr8.la + +digigr8_la_SOURCES = +digigr8_la_SOURCES += %reldir%/library.c +digigr8_la_SOURCES += %reldir%/digigr8.c +digigr8_la_SOURCES += %reldir%/digigr8.h +digigr8_la_SOURCES += %reldir%/digi_postprocess.c + +digigr8_la_CFLAGS = $(camlib_cflags) +digigr8_la_CPPFLAGS = $(camlib_cppflags) +digigr8_la_DEPENDENCIES = $(camlib_dependencies) +digigr8_la_LDFLAGS = $(camlib_ldflags) +digigr8_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/digita/Makefile-files b/camlibs/digita/Makefile-files index a3cb08692..69ff45223 100644 --- a/camlibs/digita/Makefile-files +++ b/camlibs/digita/Makefile-files @@ -1,14 +1,19 @@ -# -*- Makefile -*- - -EXTRA_LTLIBRARIES += digita.la -EXTRA_DIST += digita/ChangeLog - -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) +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/ChangeLog + + +EXTRA_LTLIBRARIES += digita.la + +digita_la_SOURCES = +digita_la_SOURCES += %reldir%/digita.c +digita_la_SOURCES += %reldir%/serial.c +digita_la_SOURCES += %reldir%/usb.c +digita_la_SOURCES += %reldir%/commands.c +digita_la_SOURCES += %reldir%/digita.h + +digita_la_CFLAGS = $(camlib_cflags) +digita_la_CPPFLAGS = $(camlib_cppflags) +digita_la_DEPENDENCIES = $(camlib_dependencies) +digita_la_LDFLAGS = $(camlib_ldflags) +digita_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/dimera/Makefile-files b/camlibs/dimera/Makefile-files index c2d6367ad..6d11c336b 100644 --- a/camlibs/dimera/Makefile-files +++ b/camlibs/dimera/Makefile-files @@ -1,13 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += dimera/CREDITS dimera/Protocol.txt dimera/ChangeLog dimera/TODO +EXTRA_DIST += %reldir%/CREDITS +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/Protocol.txt +EXTRA_DIST += %reldir%/TODO -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) +EXTRA_LTLIBRARIES += dimera3500.la + +dimera3500_la_SOURCES = +dimera3500_la_SOURCES += %reldir%/dimera3500.c +dimera3500_la_SOURCES += %reldir%/mesalib.c +dimera3500_la_SOURCES += %reldir%/mesalib.h +dimera3500_la_SOURCES += %reldir%/dimeratab.h + +dimera3500_la_CFLAGS = $(camlib_cflags) +dimera3500_la_CPPFLAGS = $(camlib_cppflags) +dimera3500_la_DEPENDENCIES = $(camlib_dependencies) +dimera3500_la_LDFLAGS = $(camlib_ldflags) +dimera3500_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/directory/Makefile-files b/camlibs/directory/Makefile-files index 15b9bdc65..747342e62 100644 --- a/camlibs/directory/Makefile-files +++ b/camlibs/directory/Makefile-files @@ -1,10 +1,17 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += directory.la -EXTRA_DIST += directory/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -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 = $(camlib_libadd) $(LIBEXIF_LIBS) + +EXTRA_LTLIBRARIES += directory.la + +directory_la_SOURCES = %reldir%/directory.c + +directory_la_CFLAGS = $(camlib_cflags) +directory_la_CPPFLAGS = $(camlib_cppflags) +directory_la_DEPENDENCIES = $(camlib_dependencies) +directory_la_LDFLAGS = $(camlib_ldflags) +directory_la_LIBADD = $(camlib_libadd) + +directory_la_CPPFLAGS += $(LIBEXIF_CFLAGS) +directory_la_LIBADD += $(LIBEXIF_LIBS) diff --git a/camlibs/docupen/Makefile-files b/camlibs/docupen/Makefile-files index 6c35aaa26..25a47fa0c 100644 --- a/camlibs/docupen/Makefile-files +++ b/camlibs/docupen/Makefile-files @@ -1,14 +1,29 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += docupen/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -#EXTRA_DIST += docupen/README.docupen -#camlibdoc_DATA += docupen/README.docupen +#EXTRA_DIST += docupen/README.docupen +#camlibdoc_DATA += docupen/README.docupen -EXTRA_LTLIBRARIES += docupen.la -docupen_la_SOURCES = docupen/docupen.c docupen/cache.c docupen/huffman.c docupen/image.c docupen/calibration.c docupen/docupen.h docupen/huffman.h -docupen_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) @LIBGD_CFLAGS@ -docupen_la_LDFLAGS = $(camlib_ldflags) -docupen_la_DEPENDENCIES = $(camlib_dependencies) -docupen_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ +EXTRA_LTLIBRARIES += docupen.la + +docupen_la_SOURCES = +docupen_la_SOURCES += %reldir%/cache.c +docupen_la_SOURCES += %reldir%/calibration.c +docupen_la_SOURCES += %reldir%/docupen.c +docupen_la_SOURCES += %reldir%/docupen.h +docupen_la_SOURCES += %reldir%/huffman.c +docupen_la_SOURCES += %reldir%/huffman.h +docupen_la_SOURCES += %reldir%/image.c + +docupen_la_CFLAGS = $(camlib_cflags) +docupen_la_CPPFLAGS = $(camlib_cppflags) +docupen_la_DEPENDENCIES = $(camlib_dependencies) +docupen_la_LDFLAGS = $(camlib_ldflags) +docupen_la_LIBADD = $(camlib_libadd) + +docupen_la_CFLAGS += $(NO_UNUSED_CFLAGS) + +docupen_la_CFLAGS += @LIBGD_CFLAGS@ +docupen_la_LIBADD += @LIBGD_LIBS@ diff --git a/camlibs/enigma13/Makefile-files b/camlibs/enigma13/Makefile-files index 015d33ac8..ca2515c6f 100644 --- a/camlibs/enigma13/Makefile-files +++ b/camlibs/enigma13/Makefile-files @@ -1,12 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += enigma13/STATUS enigma13/protocol.txt enigma13/README.enigma13 enigma13/ChangeLog -camlibdoc_DATA += enigma13/README.enigma13 +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += enigma13.la +EXTRA_DIST += %reldir%/README.enigma13 +camlibdoc_DATA += %reldir%/README.enigma13 -enigma13_la_SOURCES = enigma13/enigma13.c -enigma13_la_LDFLAGS = $(camlib_ldflags) -enigma13_la_DEPENDENCIES = $(camlib_dependencies) -enigma13_la_LIBADD = $(camlib_libadd) +EXTRA_DIST += %reldir%/STATUS +EXTRA_DIST += %reldir%/protocol.txt + +EXTRA_LTLIBRARIES += enigma13.la + +enigma13_la_SOURCES = %reldir%/enigma13.c + +enigma13_la_CFLAGS = $(camlib_cflags) +enigma13_la_CPPFLAGS = $(camlib_cppflags) +enigma13_la_DEPENDENCIES = $(camlib_dependencies) +enigma13_la_LDFLAGS = $(camlib_ldflags) +enigma13_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/fuji/Makefile-files b/camlibs/fuji/Makefile-files index 600714502..f91d52bb5 100644 --- a/camlibs/fuji/Makefile-files +++ b/camlibs/fuji/Makefile-files @@ -1,10 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += fuji/PROTOCOL fuji/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/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) +EXTRA_LTLIBRARIES += fuji.la + +fuji_la_SOURCES = +fuji_la_SOURCES += %reldir%/library.c +fuji_la_SOURCES += %reldir%/fuji.c +fuji_la_SOURCES += %reldir%/fuji.h + +fuji_la_CFLAGS = $(camlib_cflags) +fuji_la_CPPFLAGS = $(camlib_cppflags) +fuji_la_DEPENDENCIES = $(camlib_dependencies) +fuji_la_LDFLAGS = $(camlib_ldflags) +fuji_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/gsmart300/Makefile-files b/camlibs/gsmart300/Makefile-files index 8c8c3c3d7..8586340fa 100644 --- a/camlibs/gsmart300/Makefile-files +++ b/camlibs/gsmart300/Makefile-files @@ -1,14 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += gsmart300/README.gsmart300 gsmart300/ChangeLog -camlibdoc_DATA += gsmart300/README.gsmart300 +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += gsmart300.la +EXTRA_DIST += %reldir%/README.gsmart300 +camlibdoc_DATA += %reldir%/README.gsmart300 -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) + +EXTRA_LTLIBRARIES += gsmart300.la + +gsmart300_la_SOURCES = +gsmart300_la_SOURCES += %reldir%/gsmart300.c +gsmart300_la_SOURCES += %reldir%/gsmart300.h +gsmart300_la_SOURCES += %reldir%/library.c +gsmart300_la_SOURCES += %reldir%/gsmart300-jpeg-header.h + +gsmart300_la_CFLAGS = $(camlib_cflags) +gsmart300_la_CPPFLAGS = $(camlib_cppflags) +gsmart300_la_DEPENDENCIES = $(camlib_dependencies) +gsmart300_la_LDFLAGS = $(camlib_ldflags) +gsmart300_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/hp215/Makefile-files b/camlibs/hp215/Makefile-files index 751908f10..c639d2939 100644 --- a/camlibs/hp215/Makefile-files +++ b/camlibs/hp215/Makefile-files @@ -1,9 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += hp215.la -EXTRA_DIST += hp215/ChangeLog hp215/PROTOCOL +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/PROTOCOL -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) + +EXTRA_LTLIBRARIES += hp215.la + +hp215_la_SOURCES = +hp215_la_SOURCES += %reldir%/hp215.c +hp215_la_SOURCES += %reldir%/hp215.h +hp215_la_SOURCES += %reldir%/crctab.h + +hp215_la_CFLAGS = $(camlib_cflags) +hp215_la_CPPFLAGS = $(camlib_cppflags) +hp215_la_DEPENDENCIES = $(camlib_dependencies) +hp215_la_LDFLAGS = $(camlib_ldflags) +hp215_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/iclick/Makefile-files b/camlibs/iclick/Makefile-files index 7b5ffa5a6..26327495f 100644 --- a/camlibs/iclick/Makefile-files +++ b/camlibs/iclick/Makefile-files @@ -1,12 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += iclick/README.iclick iclick/ChangeLog -camlibdoc_DATA += iclick/README.iclick +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += iclick.la +EXTRA_DIST += %reldir%/README.iclick +camlibdoc_DATA += %reldir%/README.iclick -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) +EXTRA_LTLIBRARIES += iclick.la + +iclick_la_SOURCES = +iclick_la_SOURCES += %reldir%/library.c +iclick_la_SOURCES += %reldir%/iclick.c +iclick_la_SOURCES += %reldir%/iclick.h + +iclick_la_CFLAGS = $(camlib_cflags) +iclick_la_CPPFLAGS = $(camlib_cppflags) +iclick_la_DEPENDENCIES = $(camlib_dependencies) +iclick_la_LDFLAGS = $(camlib_ldflags) +iclick_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jamcam/Makefile-files b/camlibs/jamcam/Makefile-files index 4e4217a14..d34ec550b 100644 --- a/camlibs/jamcam/Makefile-files +++ b/camlibs/jamcam/Makefile-files @@ -1,11 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += jamcam/README.jamcam jamcam/ChangeLog -camlibdoc_DATA += jamcam/README.jamcam +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += jamcam.la +EXTRA_DIST += %reldir%/README.jamcam +camlibdoc_DATA += %reldir%/README.jamcam -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) + +EXTRA_LTLIBRARIES += jamcam.la + +jamcam_la_SOURCES = +jamcam_la_SOURCES += %reldir%/jamcam.c +jamcam_la_SOURCES += %reldir%/library.c +jamcam_la_SOURCES += %reldir%/library.h + +jamcam_la_CFLAGS = $(camlib_cflags) +jamcam_la_CPPFLAGS = $(camlib_cppflags) +jamcam_la_DEPENDENCIES = $(camlib_dependencies) +jamcam_la_LDFLAGS = $(camlib_ldflags) +jamcam_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jd11/Makefile-files b/camlibs/jd11/Makefile-files index d4a5a31a8..bc2cc5fe4 100644 --- a/camlibs/jd11/Makefile-files +++ b/camlibs/jd11/Makefile-files @@ -1,13 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += jd11/jd11.html jd11/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/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) +EXTRA_LTLIBRARIES += jd11.la + +jd11_la_SOURCES = +jd11_la_SOURCES += %reldir%/jd11.c +jd11_la_SOURCES += %reldir%/serial.h +jd11_la_SOURCES += %reldir%/serial.c +jd11_la_SOURCES += %reldir%/decomp.h +jd11_la_SOURCES += %reldir%/decomp.c + +jd11_la_CFLAGS = $(camlib_cflags) +jd11_la_CPPFLAGS = $(camlib_cppflags) +jd11_la_DEPENDENCIES = $(camlib_dependencies) +jd11_la_LDFLAGS = $(camlib_ldflags) +jd11_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jl2005a/Makefile-files b/camlibs/jl2005a/Makefile-files index c4bd91711..5c3e14d80 100644 --- a/camlibs/jl2005a/Makefile-files +++ b/camlibs/jl2005a/Makefile-files @@ -1,13 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += jl2005a/README.jl2005a jl2005a/ChangeLog -camlibdoc_DATA += jl2005a/README.jl2005a jl2005a/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += jl2005a.la +EXTRA_DIST += %reldir%/README.jl2005a +camlibdoc_DATA += %reldir%/README.jl2005a -jl2005a_la_SOURCES = jl2005a/library.c\ - jl2005a/jl2005a.c\ - jl2005a/jl2005a.h -jl2005a_la_LDFLAGS = $(camlib_ldflags) -jl2005a_la_DEPENDENCIES = $(camlib_dependencies) -jl2005a_la_LIBADD = $(camlib_libadd) + +EXTRA_LTLIBRARIES += jl2005a.la + +jl2005a_la_SOURCES = +jl2005a_la_SOURCES += %reldir%/library.c +jl2005a_la_SOURCES += %reldir%/jl2005a.c +jl2005a_la_SOURCES += %reldir%/jl2005a.h + +jl2005a_la_CFLAGS = $(camlib_cflags) +jl2005a_la_CPPFLAGS = $(camlib_cppflags) +jl2005a_la_DEPENDENCIES = $(camlib_dependencies) +jl2005a_la_LDFLAGS = $(camlib_ldflags) +jl2005a_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/jl2005c/Makefile-files b/camlibs/jl2005c/Makefile-files index 74693e38e..18c30ec2a 100644 --- a/camlibs/jl2005c/Makefile-files +++ b/camlibs/jl2005c/Makefile-files @@ -1,20 +1,32 @@ -# -*- Makefile -*- - -EXTRA_DIST += jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression jl2005c/ChangeLog -camlibdoc_DATA += jl2005c/README.jl2005c jl2005c/README.jl2005bcd-compression - -EXTRA_LTLIBRARIES += jl2005c.la - -jl2005c_la_SOURCES = jl2005c/library.c\ - jl2005c/jl2005c.c\ - jl2005c/jpeg_memsrcdest.c \ - jl2005c/jpeg_memsrcdest.h \ - jl2005c/jl2005bcd_decompress.c\ - jl2005c/jl2005bcd_decompress.h\ - jl2005c/jl2005c.h\ - jl2005c/img_enhance.c\ - jl2005c/img_enhance.h -jl2005c_la_LDFLAGS = $(camlib_ldflags) -jl2005c_la_DEPENDENCIES = $(camlib_dependencies) -jl2005c_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS) -jl2005c_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBJPEG_CFLAGS) +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/README.jl2005c +camlibdoc_DATA += %reldir%/README.jl2005c + +EXTRA_DIST += %reldir%/README.jl2005bcd-compression +camlibdoc_DATA += %reldir%/README.jl2005bcd-compression + +EXTRA_DIST += %reldir%/ChangeLog + + +EXTRA_LTLIBRARIES += jl2005c.la + +jl2005c_la_SOURCES = +jl2005c_la_SOURCES += %reldir%/library.c +jl2005c_la_SOURCES += %reldir%/jl2005c.c +jl2005c_la_SOURCES += %reldir%/jpeg_memsrcdest.c +jl2005c_la_SOURCES += %reldir%/jpeg_memsrcdest.h +jl2005c_la_SOURCES += %reldir%/jl2005bcd_decompress.c +jl2005c_la_SOURCES += %reldir%/jl2005bcd_decompress.h +jl2005c_la_SOURCES += %reldir%/jl2005c.h +jl2005c_la_SOURCES += %reldir%/img_enhance.c +jl2005c_la_SOURCES += %reldir%/img_enhance.h + +jl2005c_la_CFLAGS = $(camlib_cflags) +jl2005c_la_CPPFLAGS = $(camlib_cppflags) +jl2005c_la_DEPENDENCIES = $(camlib_dependencies) +jl2005c_la_LDFLAGS = $(camlib_ldflags) +jl2005c_la_LIBADD = $(camlib_libadd) + +jl2005c_la_CPPFLAGS += $(LIBJPEG_CFLAGS) +jl2005c_la_LIBADD += $(LIBJPEG_LIBS) diff --git a/camlibs/kodak/Makefile-files b/camlibs/kodak/Makefile-files index 501b1fb5d..f9b7b479c 100644 --- a/camlibs/kodak/Makefile-files +++ b/camlibs/kodak/Makefile-files @@ -1,5 +1,3 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -# SUBDIRS = dc120 dc210 dc240 dc3200 ez200 - -EXTRA_DIST += kodak/CAMERAS +EXTRA_DIST += %reldir%/CAMERAS diff --git a/camlibs/kodak/dc120/Makefile-files b/camlibs/kodak/dc120/Makefile-files index b160eb3ef..28b8e345a 100644 --- a/camlibs/kodak/dc120/Makefile-files +++ b/camlibs/kodak/dc120/Makefile-files @@ -1,11 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += kodak_dc120.la -EXTRA_DIST += kodak/dc120/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -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) + +EXTRA_LTLIBRARIES += kodak_dc120.la + +kodak_dc120_la_SOURCES = +kodak_dc120_la_SOURCES += %reldir%/dc120.c +kodak_dc120_la_SOURCES += %reldir%/dc120.h +kodak_dc120_la_SOURCES += %reldir%/library.c +kodak_dc120_la_SOURCES += %reldir%/library.h + +kodak_dc120_la_CFLAGS = $(camlib_cflags) +kodak_dc120_la_CPPFLAGS = $(camlib_cppflags) +kodak_dc120_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc120_la_LDFLAGS = $(camlib_ldflags) +kodak_dc120_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc210/Makefile-files b/camlibs/kodak/dc210/Makefile-files index e446dc2e6..5b6fa282a 100644 --- a/camlibs/kodak/dc210/Makefile-files +++ b/camlibs/kodak/dc210/Makefile-files @@ -1,11 +1,19 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += kodak_dc210.la -EXTRA_DIST += kodak/dc210/ChangeLog kodak/dc210/TODO +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/TODO -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) + +EXTRA_LTLIBRARIES += kodak_dc210.la + +kodak_dc210_la_SOURCES = +kodak_dc210_la_SOURCES += %reldir%/dc210.c +kodak_dc210_la_SOURCES += %reldir%/dc210.h +kodak_dc210_la_SOURCES += %reldir%/library.c +kodak_dc210_la_SOURCES += %reldir%/library.h + +kodak_dc210_la_CFLAGS = $(camlib_cflags) +kodak_dc210_la_CPPFLAGS = $(camlib_cppflags) +kodak_dc210_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc210_la_LDFLAGS = $(camlib_ldflags) +kodak_dc210_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc240/Makefile-files b/camlibs/kodak/dc240/Makefile-files index 522fd628d..97faf99d6 100644 --- a/camlibs/kodak/dc240/Makefile-files +++ b/camlibs/kodak/dc240/Makefile-files @@ -1,11 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += kodak_dc240.la -EXTRA_DIST += kodak/dc240/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -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) + +EXTRA_LTLIBRARIES += kodak_dc240.la + +kodak_dc240_la_SOURCES = +kodak_dc240_la_SOURCES += %reldir%/dc240.c +kodak_dc240_la_SOURCES += %reldir%/dc240.h +kodak_dc240_la_SOURCES += %reldir%/library.c +kodak_dc240_la_SOURCES += %reldir%/library.h + +kodak_dc240_la_CFLAGS = $(camlib_cflags) +kodak_dc240_la_CPPFLAGS = $(camlib_cppflags) +kodak_dc240_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc240_la_LDFLAGS = $(camlib_ldflags) +kodak_dc240_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/dc3200/Makefile-files b/camlibs/kodak/dc3200/Makefile-files index e07e2086e..dbb1ddd01 100644 --- a/camlibs/kodak/dc3200/Makefile-files +++ b/camlibs/kodak/dc3200/Makefile-files @@ -1,11 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += kodak_dc3200.la -EXTRA_DIST += kodak/dc3200/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -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) + +EXTRA_LTLIBRARIES += kodak_dc3200.la + +kodak_dc3200_la_SOURCES = +kodak_dc3200_la_SOURCES += %reldir%/dc3200.c +kodak_dc3200_la_SOURCES += %reldir%/dc3200.h +kodak_dc3200_la_SOURCES += %reldir%/library.c +kodak_dc3200_la_SOURCES += %reldir%/library.h + +kodak_dc3200_la_CFLAGS = $(camlib_cflags) +kodak_dc3200_la_CPPFLAGS = $(camlib_cppflags) +kodak_dc3200_la_DEPENDENCIES = $(camlib_dependencies) +kodak_dc3200_la_LDFLAGS = $(camlib_ldflags) +kodak_dc3200_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/kodak/ez200/Makefile-files b/camlibs/kodak/ez200/Makefile-files index c79796908..8d9489986 100644 --- a/camlibs/kodak/ez200/Makefile-files +++ b/camlibs/kodak/ez200/Makefile-files @@ -1,10 +1,16 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += kodak/ez200/Protocol.txt kodak/ez200/ez200-lsusb.txt kodak/ez200/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/Protocol.txt +EXTRA_DIST += %reldir%/ez200-lsusb.txt -EXTRA_LTLIBRARIES += kodak_ez200.la -kodak_ez200_la_SOURCES = kodak/ez200/ez200.c -kodak_ez200_la_LDFLAGS = $(camlib_ldflags) -kodak_ez200_la_DEPENDENCIES = $(camlib_dependencies) -kodak_ez200_la_LIBADD = $(camlib_libadd) +EXTRA_LTLIBRARIES += kodak_ez200.la + +kodak_ez200_la_SOURCES = %reldir%/ez200.c + +kodak_ez200_la_CFLAGS = $(camlib_cflags) +kodak_ez200_la_CPPFLAGS = $(camlib_cppflags) +kodak_ez200_la_DEPENDENCIES = $(camlib_dependencies) +kodak_ez200_la_LDFLAGS = $(camlib_ldflags) +kodak_ez200_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/konica/Makefile-files b/camlibs/konica/Makefile-files index 5d20d348f..ffd76aacd 100644 --- a/camlibs/konica/Makefile-files +++ b/camlibs/konica/Makefile-files @@ -1,29 +1,58 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -SUBDIRS += konica/localization -EXTRA_DIST += konica/EXPERTS konica/qm150.txt konica/README.konica konica/ChangeLog konica/COPYING konica/TODO -camlibdoc_DATA += konica/README.konica +konicalocalizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica -konica_defs = \ - -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\" +dist_konicalocalization_DATA = +dist_konicalocalization_DATA += %reldir%/localization/english +dist_konicalocalization_DATA += %reldir%/localization/french +dist_konicalocalization_DATA += %reldir%/localization/german +dist_konicalocalization_DATA += %reldir%/localization/japanese +dist_konicalocalization_DATA += %reldir%/localization/korean +dist_konicalocalization_DATA += %reldir%/localization/spanish -EXTRA_LTLIBRARIES += konica.la +konica_defs = -DLOCALIZATION=\"$(konicalocalizationdir)\" -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_DIST += %reldir%/COPYING +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/EXPERTS +EXTRA_DIST += %reldir%/TODO +EXTRA_DIST += %reldir%/qm150.txt -EXTRA_LTLIBRARIES += konica_qm150.la +EXTRA_DIST += %reldir%/README.konica +camlibdoc_DATA += %reldir%/README.konica -konica_qm150_la_SOURCES = konica/qm150.c -konica_qm150_la_CPPFLAGS = $(AM_CPPFLAGS) $(konica_defs) $(CPPFLAGS) $(LIBEXIF_CFLAGS) -konica_qm150_la_LDFLAGS = $(camlib_ldflags) -konica_qm150_la_DEPENDENCIES = $(camlib_dependencies) -konica_qm150_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS) + +EXTRA_LTLIBRARIES += konica.la + +konica_la_SOURCES = +konica_la_SOURCES += %reldir%/lowlevel.c +konica_la_SOURCES += %reldir%/lowlevel.h +konica_la_SOURCES += %reldir%/konica.c +konica_la_SOURCES += %reldir%/konica.h +konica_la_SOURCES += %reldir%/library.c + +konica_la_CFLAGS = $(camlib_cflags) +konica_la_CPPFLAGS = $(camlib_cppflags) +konica_la_DEPENDENCIES = $(camlib_dependencies) +konica_la_LDFLAGS = $(camlib_ldflags) +konica_la_LIBADD = $(camlib_libadd) + +konica_la_CPPFLAGS += $(konica_defs) + + +EXTRA_LTLIBRARIES += konica_qm150.la + +konica_qm150_la_SOURCES = %reldir%/qm150.c + +konica_qm150_la_CFLAGS = $(camlib_cflags) +konica_qm150_la_CPPFLAGS = $(camlib_cppflags) +konica_qm150_la_DEPENDENCIES = $(camlib_dependencies) +konica_qm150_la_LDFLAGS = $(camlib_ldflags) +konica_qm150_la_LIBADD = $(camlib_libadd) + +konica_qm150_la_CPPFLAGS += $(konica_defs) + +konica_qm150_la_CPPFLAGS += $(LIBEXIF_CFLAGS) +konica_qm150_la_LIBADD += $(LIBEXIF_LIBS) diff --git a/camlibs/konica/localization/Makefile.am b/camlibs/konica/localization/Makefile.am deleted file mode 100644 index 73f35be6a..000000000 --- a/camlibs/konica/localization/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -localizationdir = $(datadir)/$(PACKAGE)/$(VERSION)/konica -localization_DATA = english french german japanese korean spanish - -EXTRA_DIST = $(localization_DATA) diff --git a/camlibs/largan/lmini/Makefile-files b/camlibs/largan/lmini/Makefile-files index 70f5d1d54..e6c98772e 100644 --- a/camlibs/largan/lmini/Makefile-files +++ b/camlibs/largan/lmini/Makefile-files @@ -1,14 +1,22 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += largan/lmini/README.largan-lmini largan/lmini/ChangeLog -camlibdoc_DATA += largan/lmini/README.largan-lmini +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += largan.la +EXTRA_DIST += %reldir%/README.largan-lmini +camlibdoc_DATA += %reldir%/README.largan-lmini -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) + +EXTRA_LTLIBRARIES += largan.la + +largan_la_SOURCES = +largan_la_SOURCES += %reldir%/largan.c +largan_la_SOURCES += %reldir%/lmini.c +largan_la_SOURCES += %reldir%/lmini.h +largan_la_SOURCES += %reldir%/lmini_ccd.c +largan_la_SOURCES += %reldir%/lmini_ccd.h + +largan_la_CFLAGS = $(camlib_cflags) +largan_la_CPPFLAGS = $(camlib_cppflags) +largan_la_DEPENDENCIES = $(camlib_dependencies) +largan_la_LDFLAGS = $(camlib_ldflags) +largan_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/lg_gsm/Makefile-files b/camlibs/lg_gsm/Makefile-files index 754147af5..7c3702f6b 100644 --- a/camlibs/lg_gsm/Makefile-files +++ b/camlibs/lg_gsm/Makefile-files @@ -1,11 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += lg_gsm/README.lg_gsm lg_gsm/ChangeLog -camlibdoc_DATA += lg_gsm/README.lg_gsm +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += lg_gsm.la +EXTRA_DIST += %reldir%/README.lg_gsm +camlibdoc_DATA += %reldir%/README.lg_gsm -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) + +EXTRA_LTLIBRARIES += lg_gsm.la + +lg_gsm_la_SOURCES = +lg_gsm_la_SOURCES += %reldir%/library.c +lg_gsm_la_SOURCES += %reldir%/lg_gsm.c +lg_gsm_la_SOURCES += %reldir%/lg_gsm.h + +lg_gsm_la_CFLAGS = $(camlib_cflags) +lg_gsm_la_CPPFLAGS = $(camlib_cppflags) +lg_gsm_la_DEPENDENCIES = $(camlib_dependencies) +lg_gsm_la_LDFLAGS = $(camlib_ldflags) +lg_gsm_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/lumix/Makefile-files b/camlibs/lumix/Makefile-files index 55943b7b4..f4676989a 100644 --- a/camlibs/lumix/Makefile-files +++ b/camlibs/lumix/Makefile-files @@ -1,12 +1,25 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += lumix/README.lumix -noinst_DATA += lumix/README.lumix +EXTRA_DIST += %reldir%/README.lumix +noinst_DATA += %reldir%/README.lumix -EXTRA_LTLIBRARIES += lumix.la -lumix_la_SOURCES = lumix/lumix.c -lumix_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) $(LIBCURL_CFLAGS) -lumix_la_LDFLAGS = $(camlib_ldflags) -lumix_la_DEPENDENCIES = $(camlib_dependencies) -lumix_la_LIBADD = $(camlib_libadd) $(LIBCURL_LIBS) $(LIBXML2_LIBS) @LIBWS232@ +EXTRA_LTLIBRARIES += lumix.la + +lumix_la_SOURCES = %reldir%/lumix.c + +lumix_la_CFLAGS = $(camlib_cflags) +lumix_la_CPPFLAGS = $(camlib_cppflags) +lumix_la_DEPENDENCIES = $(camlib_dependencies) +lumix_la_LDFLAGS = $(camlib_ldflags) +lumix_la_LIBADD = $(camlib_libadd) + +lumix_la_CFLAGS += $(NO_UNUSED_CFLAGS) + +lumix_la_CFLAGS += $(LIBCURL_CFLAGS) +lumix_la_LIBADD += $(LIBCURL_LIBS) + +lumix_la_CFLAGS += $(LIBXML2_CFLAGS) +lumix_la_LIBADD += $(LIBXML2_LIBS) + +lumix_la_LIBADD += @LIBWS232@ diff --git a/camlibs/mars/Makefile-files b/camlibs/mars/Makefile-files index 4009a68d3..de364a6c7 100644 --- a/camlibs/mars/Makefile-files +++ b/camlibs/mars/Makefile-files @@ -1,11 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += mars/protocol.txt mars/README.mars mars/ChangeLog -camlibdoc_DATA += mars/README.mars +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/protocol.txt -EXTRA_LTLIBRARIES += mars.la +EXTRA_DIST += %reldir%/README.mars +camlibdoc_DATA += %reldir%/README.mars -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) + +EXTRA_LTLIBRARIES += mars.la + +mars_la_SOURCES = +mars_la_SOURCES += %reldir%/library.c +mars_la_SOURCES += %reldir%/mars.c +mars_la_SOURCES += %reldir%/mars.h + +mars_la_CFLAGS = $(camlib_cflags) +mars_la_CPPFLAGS = $(camlib_cppflags) +mars_la_DEPENDENCIES = $(camlib_dependencies) +mars_la_LDFLAGS = $(camlib_ldflags) +mars_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/minolta/Makefile-files b/camlibs/minolta/Makefile-files index 5cd6f5d27..f1aef15d9 100644 --- a/camlibs/minolta/Makefile-files +++ b/camlibs/minolta/Makefile-files @@ -1,3 +1,3 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += minolta/NEWER_MINOLTAS +EXTRA_DIST += %reldir%/NEWER_MINOLTAS diff --git a/camlibs/minolta/dimagev/Makefile-files b/camlibs/minolta/dimagev/Makefile-files index e24e2009e..685e1b0ad 100644 --- a/camlibs/minolta/dimagev/Makefile-files +++ b/camlibs/minolta/dimagev/Makefile-files @@ -1,22 +1,28 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += minolta/dimagev/README.minolta-dimagev minolta/dimagev/COPYING -camlibdoc_DATA += minolta/dimagev/README.minolta-dimagev +EXTRA_DIST += %reldir%/COPYING -EXTRA_LTLIBRARIES += dimagev.la +EXTRA_DIST += %reldir%/README.minolta-dimagev +camlibdoc_DATA += %reldir%/README.minolta-dimagev -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) + +EXTRA_LTLIBRARIES += dimagev.la + +dimagev_la_SOURCES = +dimagev_la_SOURCES += %reldir%/capture.c +dimagev_la_SOURCES += %reldir%/data.c +dimagev_la_SOURCES += %reldir%/delete.c +dimagev_la_SOURCES += %reldir%/dimagev.c +dimagev_la_SOURCES += %reldir%/dimagev.h +dimagev_la_SOURCES += %reldir%/download.c +dimagev_la_SOURCES += %reldir%/info.c +dimagev_la_SOURCES += %reldir%/packet.c +dimagev_la_SOURCES += %reldir%/status.c +dimagev_la_SOURCES += %reldir%/upload.c +dimagev_la_SOURCES += %reldir%/util.c + +dimagev_la_CFLAGS = $(camlib_cflags) +dimagev_la_CPPFLAGS = $(camlib_cppflags) +dimagev_la_DEPENDENCIES = $(camlib_dependencies) +dimagev_la_LDFLAGS = $(camlib_ldflags) +dimagev_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/mustek/Makefile-files b/camlibs/mustek/Makefile-files index 889775191..a0779afc3 100644 --- a/camlibs/mustek/Makefile-files +++ b/camlibs/mustek/Makefile-files @@ -1,14 +1,32 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += mustek/AUTHOR mustek/README.mustek mustek/ChangeLog mustek/STATUS -camlibdoc_DATA += mustek/README.mustek +EXTRA_DIST += %reldir%/AUTHOR +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/STATUS -EXTRA_LTLIBRARIES += mustek.la +EXTRA_DIST += %reldir%/README.mustek +camlibdoc_DATA += %reldir%/README.mustek -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) + +EXTRA_LTLIBRARIES += mustek.la + +mustek_la_SOURCES = +mustek_la_SOURCES += %reldir%/mdc800.c +mustek_la_SOURCES += %reldir%/core.c +mustek_la_SOURCES += %reldir%/image.c +mustek_la_SOURCES += %reldir%/io.c +mustek_la_SOURCES += %reldir%/rs232.c +mustek_la_SOURCES += %reldir%/usb.c +mustek_la_SOURCES += %reldir%/core.h +mustek_la_SOURCES += %reldir%/image.h +mustek_la_SOURCES += %reldir%/io.h +mustek_la_SOURCES += %reldir%/mdc800_spec.h +mustek_la_SOURCES += %reldir%/print.h +mustek_la_SOURCES += %reldir%/rs232.h +mustek_la_SOURCES += %reldir%/usb.h + +mustek_la_CFLAGS = $(camlib_cflags) +mustek_la_CPPFLAGS = $(camlib_cppflags) +mustek_la_DEPENDENCIES = $(camlib_dependencies) +mustek_la_LDFLAGS = $(camlib_ldflags) +mustek_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/Makefile-files b/camlibs/panasonic/Makefile-files index 804aa51d8..98cbb5bd8 100644 --- a/camlibs/panasonic/Makefile-files +++ b/camlibs/panasonic/Makefile-files @@ -1,24 +1,39 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- # SUBDIRS = coolshot l859 -EXTRA_DIST += panasonic/README.panasonic panasonic/ChangeLog -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) + +EXTRA_DIST += %reldir%/ChangeLog + +EXTRA_DIST += %reldir%/README.panasonic +camlibdoc_DATA += %reldir%/README.panasonic + + +EXTRA_LTLIBRARIES += panasonic_dc1000.la + +panasonic_dc1000_la_SOURCES = +panasonic_dc1000_la_SOURCES += %reldir%/dc1000.c +panasonic_dc1000_la_SOURCES += %reldir%/dc1000.h +panasonic_dc1000_la_SOURCES += %reldir%/dc.c +panasonic_dc1000_la_SOURCES += %reldir%/dc.h + +panasonic_dc1000_la_CFLAGS = $(camlib_cflags) +panasonic_dc1000_la_CPPFLAGS = $(camlib_cppflags) +panasonic_dc1000_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_dc1000_la_LDFLAGS = $(camlib_ldflags) +panasonic_dc1000_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += panasonic_dc1580.la + +panasonic_dc1580_la_SOURCES = +panasonic_dc1580_la_SOURCES += %reldir%/dc1580.c +panasonic_dc1580_la_SOURCES += %reldir%/dc1580.h +panasonic_dc1580_la_SOURCES += %reldir%/dc.c +panasonic_dc1580_la_SOURCES += %reldir%/dc.h +panasonic_dc1580_la_SOURCES += %reldir%/dc1000.h + +panasonic_dc1580_la_CFLAGS = $(camlib_cflags) +panasonic_dc1580_la_CPPFLAGS = $(camlib_cppflags) +panasonic_dc1580_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_dc1580_la_LDFLAGS = $(camlib_ldflags) +panasonic_dc1580_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/coolshot/Makefile-files b/camlibs/panasonic/coolshot/Makefile-files index 1213940ce..0dc07a02f 100644 --- a/camlibs/panasonic/coolshot/Makefile-files +++ b/camlibs/panasonic/coolshot/Makefile-files @@ -1,13 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += panasonic/coolshot/README.panasonic-coolshot panasonic/coolshot/ChangeLog -camlibdoc_DATA += panasonic/coolshot/README.panasonic-coolshot +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += panasonic_coolshot.la +EXTRA_DIST += %reldir%/README.panasonic-coolshot +camlibdoc_DATA += %reldir%/README.panasonic-coolshot -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) + +EXTRA_LTLIBRARIES += panasonic_coolshot.la + +panasonic_coolshot_la_SOURCES = +panasonic_coolshot_la_SOURCES += %reldir%/coolshot.c +panasonic_coolshot_la_SOURCES += %reldir%/library.c +panasonic_coolshot_la_SOURCES += %reldir%/library.h + +panasonic_coolshot_la_CFLAGS = $(camlib_cflags) +panasonic_coolshot_la_CPPFLAGS = $(camlib_cppflags) +panasonic_coolshot_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_coolshot_la_LDFLAGS = $(camlib_ldflags) +panasonic_coolshot_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/panasonic/l859/Makefile-files b/camlibs/panasonic/l859/Makefile-files index d1753d579..6c038f05a 100644 --- a/camlibs/panasonic/l859/Makefile-files +++ b/camlibs/panasonic/l859/Makefile-files @@ -1,11 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += panasonic/l859/README.panasonic-l859 panasonic/l859/ChangeLog panasonic/l859/TODO -camlibdoc_DATA += panasonic/l859/README.panasonic-l859 +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/TODO -EXTRA_LTLIBRARIES += panasonic_l859.la +EXTRA_DIST += %reldir%/README.panasonic-l859 +camlibdoc_DATA += %reldir%/README.panasonic-l859 -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) + +EXTRA_LTLIBRARIES += panasonic_l859.la + +panasonic_l859_la_SOURCES = +panasonic_l859_la_SOURCES += %reldir%/l859.c +panasonic_l859_la_SOURCES += %reldir%/l859.h + +panasonic_l859_la_CFLAGS = $(camlib_cflags) +panasonic_l859_la_CPPFLAGS = $(camlib_cppflags) +panasonic_l859_la_DEPENDENCIES = $(camlib_dependencies) +panasonic_l859_la_LDFLAGS = $(camlib_ldflags) +panasonic_l859_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/pccam300/Makefile-files b/camlibs/pccam300/Makefile-files index 5b1c0e648..924571917 100644 --- a/camlibs/pccam300/Makefile-files +++ b/camlibs/pccam300/Makefile-files @@ -1,11 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += pccam300/README.pccam300 pccam300/pccam300-lsusb.txt pccam300/ChangeLog -camlibdoc_DATA += pccam300/README.pccam300 +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/pccam300-lsusb.txt -EXTRA_LTLIBRARIES += pccam300.la +EXTRA_DIST += %reldir%/README.pccam300 +camlibdoc_DATA += %reldir%/README.pccam300 -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) + +EXTRA_LTLIBRARIES += pccam300.la + +pccam300_la_SOURCES = +pccam300_la_SOURCES += %reldir%/pccam300.c +pccam300_la_SOURCES += %reldir%/pccam300.h +pccam300_la_SOURCES += %reldir%/library.c + +pccam300_la_CFLAGS = $(camlib_cflags) +pccam300_la_CPPFLAGS = $(camlib_cppflags) +pccam300_la_DEPENDENCIES = $(camlib_dependencies) +pccam300_la_LDFLAGS = $(camlib_ldflags) +pccam300_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/pccam600/Makefile-files b/camlibs/pccam600/Makefile-files index 38905bb28..b96a132d0 100644 --- a/camlibs/pccam600/Makefile-files +++ b/camlibs/pccam600/Makefile-files @@ -1,11 +1,20 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += pccam600/README.pccam600 pccam600/ChangeLog -camlibdoc_DATA += pccam600/README.pccam600 +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += pccam600.la +EXTRA_DIST += %reldir%/README.pccam600 +camlibdoc_DATA += %reldir%/README.pccam600 -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) + +EXTRA_LTLIBRARIES += pccam600.la + +pccam600_la_SOURCES = +pccam600_la_SOURCES += %reldir%/pccam600.c +pccam600_la_SOURCES += %reldir%/pccam600.h +pccam600_la_SOURCES += %reldir%/library.c + +pccam600_la_CFLAGS = $(camlib_cflags) +pccam600_la_CPPFLAGS = $(camlib_cppflags) +pccam600_la_DEPENDENCIES = $(camlib_dependencies) +pccam600_la_LDFLAGS = $(camlib_ldflags) +pccam600_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/pentax/Makefile-files b/camlibs/pentax/Makefile-files index 7317e7021..b44c8dfa5 100644 --- a/camlibs/pentax/Makefile-files +++ b/camlibs/pentax/Makefile-files @@ -1,12 +1,36 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += pentax/README.pentax pentax/ChangeLog pentax/exiftool_pentax_lens.txt +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/exiftool_pentax_lens.txt -camlibdoc_DATA += pentax/README.pentax -EXTRA_LTLIBRARIES += pentax.la +EXTRA_DIST += %reldir%/README.pentax +camlibdoc_DATA += %reldir%/README.pentax -pentax_la_SOURCES = pentax/pslr.c pentax/library.c pentax/pslr_enum.c pentax/pslr_lens.c pentax/pslr_model.c pentax/pslr_enum.h pentax/pslr.h pentax/pslr_lens.h pentax/pslr_model.h pentax/pslr_scsi.h pentax/exiftool_pentax_lens.txt pentax/js0n.c pentax/js0n.h -pentax_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) -DLIBGPHOTO2 -DPKTDATADIR='"/"' -pentax_la_LDFLAGS = $(camlib_ldflags) -pentax_la_DEPENDENCIES = $(camlib_dependencies) -pentax_la_LIBADD = $(camlib_libadd) + +EXTRA_LTLIBRARIES += pentax.la + +pentax_la_SOURCES = +pentax_la_SOURCES += %reldir%/pslr.c +pentax_la_SOURCES += %reldir%/library.c +pentax_la_SOURCES += %reldir%/pslr_enum.c +pentax_la_SOURCES += %reldir%/pslr_lens.c +pentax_la_SOURCES += %reldir%/pslr_model.c +pentax_la_SOURCES += %reldir%/pslr_enum.h +pentax_la_SOURCES += %reldir%/pslr.h +pentax_la_SOURCES += %reldir%/pslr_lens.h +pentax_la_SOURCES += %reldir%/pslr_model.h +pentax_la_SOURCES += %reldir%/pslr_scsi.h +pentax_la_SOURCES += %reldir%/exiftool_pentax_lens.txt +pentax_la_SOURCES += %reldir%/js0n.c +pentax_la_SOURCES += %reldir%/js0n.h + +pentax_la_CFLAGS = $(camlib_cflags) +pentax_la_CPPFLAGS = $(camlib_cppflags) +pentax_la_DEPENDENCIES = $(camlib_dependencies) +pentax_la_LDFLAGS = $(camlib_ldflags) +pentax_la_LIBADD = $(camlib_libadd) + +pentax_la_CFLAGS += $(NO_UNUSED_CFLAGS) + +pentax_la_CFLAGS += -DLIBGPHOTO2 +pentax_la_CFLAGS += -DPKTDATADIR='"/"' diff --git a/camlibs/polaroid/Makefile-files b/camlibs/polaroid/Makefile-files index e58a5e98f..d11b3f974 100644 --- a/camlibs/polaroid/Makefile-files +++ b/camlibs/polaroid/Makefile-files @@ -1,31 +1,49 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += polaroid/jpeg.txt polaroid/jpeghead.h \ - polaroid/pdc320.html polaroid/gt98x.html polaroid/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/gt98x.html +EXTRA_DIST += %reldir%/jpeg.txt +EXTRA_DIST += %reldir%/jpeghead.h +EXTRA_DIST += %reldir%/pdc320.html -EXTRA_LTLIBRARIES += polaroid_pdc320.la +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) +polaroid_pdc320_la_SOURCES = +polaroid_pdc320_la_SOURCES += %reldir%/pdc320.c +polaroid_pdc320_la_SOURCES += %reldir%/pdc320.h +polaroid_pdc320_la_CFLAGS = $(camlib_cflags) +polaroid_pdc320_la_CPPFLAGS = $(camlib_cppflags) +polaroid_pdc320_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc320_la_LDFLAGS = $(camlib_ldflags) +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_pdc640.la +polaroid_pdc640_la_SOURCES = +polaroid_pdc640_la_SOURCES += %reldir%/pdc640.c +polaroid_pdc640_la_SOURCES += %reldir%/jd350e.h +polaroid_pdc640_la_SOURCES += %reldir%/jd350e.c +polaroid_pdc640_la_SOURCES += %reldir%/jd350e_red.h +polaroid_pdc640_la_SOURCES += %reldir%/jd350e_blue.h +polaroid_pdc640_la_SOURCES += %reldir%/dlink350f.c +polaroid_pdc640_la_SOURCES += %reldir%/dlink350f.h -EXTRA_LTLIBRARIES += polaroid_pdc700.la +polaroid_pdc640_la_CFLAGS = $(camlib_cflags) +polaroid_pdc640_la_CPPFLAGS = $(camlib_cppflags) +polaroid_pdc640_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc640_la_LDFLAGS = $(camlib_ldflags) +polaroid_pdc640_la_LIBADD = $(camlib_libadd) -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) + +EXTRA_LTLIBRARIES += polaroid_pdc700.la + +polaroid_pdc700_la_SOURCES = %reldir%/pdc700.c + +polaroid_pdc700_la_CFLAGS = $(camlib_cflags) +polaroid_pdc700_la_CPPFLAGS = $(camlib_cppflags) +polaroid_pdc700_la_DEPENDENCIES = $(camlib_dependencies) +polaroid_pdc700_la_LDFLAGS = $(camlib_ldflags) +polaroid_pdc700_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/ptp2/Makefile-files b/camlibs/ptp2/Makefile-files index f036a9649..ce798a2b7 100644 --- a/camlibs/ptp2/Makefile-files +++ b/camlibs/ptp2/Makefile-files @@ -1,21 +1,52 @@ -# -*- Makefile -*- - -EXTRA_DIST += ptp2/ptp-pack.c ptp2/PTPIP.TXT ptp2/README.ptp2 \ - ptp2/TODO ptp2/ChangeLog ptp2/ptpip.html ptp2/TESTPLAN.ptp2 \ - ptp2/canon-eos-olc.txt -camlibdoc_DATA += ptp2/README.ptp2 - -EXTRA_LTLIBRARIES += ptp2.la - -ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS) $(LIBJPEG_CFLAGS) -ptp2_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) -Wshadow -ptp2_la_SOURCES = \ - ptp2/ptp.c ptp2/ptp.h ptp2/chdk_ptp.h ptp2/chdk_live_view.h \ - ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \ - ptp2/ptp-private.h ptp2/ptpip.c ptp2/config.c \ - ptp2/music-players.h ptp2/device-flags.h \ - ptp2/olympus-wrap.c ptp2/olympus-wrap.h \ - ptp2/chdk.c ptp2/fujiptpip.c ptp2/ptpip-private.h -ptp2_la_LDFLAGS = $(camlib_ldflags) -ptp2_la_DEPENDENCIES = $(camlib_dependencies) -ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) $(LIBJPEG_LIBS) @LIBWS232@ +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/PTPIP.TXT +EXTRA_DIST += %reldir%/TESTPLAN.ptp2 +EXTRA_DIST += %reldir%/TODO +EXTRA_DIST += %reldir%/canon-eos-olc.txt +EXTRA_DIST += %reldir%/ptp-pack.c +EXTRA_DIST += %reldir%/ptpip.html + +EXTRA_DIST += %reldir%/README.ptp2 +camlibdoc_DATA += %reldir%/README.ptp2 + + +EXTRA_LTLIBRARIES += ptp2.la + +ptp2_la_SOURCES = +ptp2_la_SOURCES += %reldir%/ptp.c +ptp2_la_SOURCES += %reldir%/ptp.h +ptp2_la_SOURCES += %reldir%/chdk_ptp.h +ptp2_la_SOURCES += %reldir%/chdk_live_view.h +ptp2_la_SOURCES += %reldir%/library.c +ptp2_la_SOURCES += %reldir%/usb.c +ptp2_la_SOURCES += %reldir%/ptp-bugs.h +ptp2_la_SOURCES += %reldir%/ptp-private.h +ptp2_la_SOURCES += %reldir%/ptpip.c +ptp2_la_SOURCES += %reldir%/config.c +ptp2_la_SOURCES += %reldir%/music-players.h +ptp2_la_SOURCES += %reldir%/device-flags.h +ptp2_la_SOURCES += %reldir%/olympus-wrap.c +ptp2_la_SOURCES += %reldir%/olympus-wrap.h +ptp2_la_SOURCES += %reldir%/chdk.c +ptp2_la_SOURCES += %reldir%/fujiptpip.c +ptp2_la_SOURCES += %reldir%/ptpip-private.h + +ptp2_la_CFLAGS = $(camlib_cflags) +ptp2_la_CPPFLAGS = $(camlib_cppflags) +ptp2_la_DEPENDENCIES = $(camlib_dependencies) +ptp2_la_LDFLAGS = $(camlib_ldflags) +ptp2_la_LIBADD = $(camlib_libadd) + +ptp2_la_CFLAGS += -Wshadow + +ptp2_la_LIBADD += $(LTLIBICONV) + +ptp2_la_CPPFLAGS += $(LIBXML2_CFLAGS) +ptp2_la_LIBADD += $(LIBXML2_LIBS) + +ptp2_la_CPPFLAGS += $(LIBJPEG_CFLAGS) +ptp2_la_LIBADD += $(LIBJPEG_LIBS) + +ptp2_la_LIBADD += @LIBWS232@ diff --git a/camlibs/ricoh/Makefile-files b/camlibs/ricoh/Makefile-files index 46f73917d..88b79845f 100644 --- a/camlibs/ricoh/Makefile-files +++ b/camlibs/ricoh/Makefile-files @@ -1,19 +1,30 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += ricoh/g3.txt ricoh/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/g3.txt -EXTRA_LTLIBRARIES += ricoh.la +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) +ricoh_la_SOURCES = +ricoh_la_SOURCES += %reldir%/library.c +ricoh_la_SOURCES += %reldir%/ricoh.c +ricoh_la_SOURCES += %reldir%/ricoh.h +ricoh_la_SOURCES += %reldir%/crctab.h +ricoh_la_CFLAGS = $(camlib_cflags) +ricoh_la_CPPFLAGS = $(camlib_cppflags) +ricoh_la_DEPENDENCIES = $(camlib_dependencies) +ricoh_la_LDFLAGS = $(camlib_ldflags) +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) +EXTRA_LTLIBRARIES += ricoh_g3.la + +ricoh_g3_la_SOURCES = %reldir%/g3.c + +ricoh_g3_la_CFLAGS = $(camlib_cflags) +ricoh_g3_la_CPPFLAGS = $(camlib_cppflags) +ricoh_g3_la_DEPENDENCIES = $(camlib_dependencies) +ricoh_g3_la_LDFLAGS = $(camlib_ldflags) +ricoh_g3_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/samsung/Makefile-files b/camlibs/samsung/Makefile-files index 3c89cc842..cd3529a6c 100644 --- a/camlibs/samsung/Makefile-files +++ b/camlibs/samsung/Makefile-files @@ -1,9 +1,14 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += samsung.la -EXTRA_DIST += samsung/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -samsung_la_SOURCES = samsung/samsung.c -samsung_la_LDFLAGS = $(camlib_ldflags) -samsung_la_DEPENDENCIES = $(camlib_dependencies) -samsung_la_LIBADD = $(camlib_libadd) + +EXTRA_LTLIBRARIES += samsung.la + +samsung_la_SOURCES = %reldir%/samsung.c + +samsung_la_CFLAGS = $(camlib_cflags) +samsung_la_CPPFLAGS = $(camlib_cppflags) +samsung_la_DEPENDENCIES = $(camlib_dependencies) +samsung_la_LDFLAGS = $(camlib_ldflags) +samsung_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sierra/Makefile-files b/camlibs/sierra/Makefile-files index 9d791809d..b9e62d8e7 100644 --- a/camlibs/sierra/Makefile-files +++ b/camlibs/sierra/Makefile-files @@ -1,16 +1,30 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += sierra/PROTOCOL sierra/ChangeLog sierra/MC-EU1-Protocol.txt +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/MC-EU1-Protocol.txt +EXTRA_DIST += %reldir%/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 = $(camlib_libadd) $(LIBEXIF_LIBS) +EXTRA_LTLIBRARIES += sierra.la + +sierra_la_SOURCES = +sierra_la_SOURCES += %reldir%/sierra.c +sierra_la_SOURCES += %reldir%/sierra.h +sierra_la_SOURCES += %reldir%/library.c +sierra_la_SOURCES += %reldir%/library.h +sierra_la_SOURCES += %reldir%/sierra-usbwrap.c +sierra_la_SOURCES += %reldir%/sierra-usbwrap.h +sierra_la_SOURCES += %reldir%/sierra-desc.h +sierra_la_SOURCES += %reldir%/sierra-desc.c +sierra_la_SOURCES += %reldir%/nikon-desc.c +sierra_la_SOURCES += %reldir%/olympus-desc.c +sierra_la_SOURCES += %reldir%/epson-desc.c + +sierra_la_CFLAGS = $(camlib_cflags) +sierra_la_CPPFLAGS = $(camlib_cppflags) +sierra_la_DEPENDENCIES = $(camlib_dependencies) +sierra_la_LDFLAGS = $(camlib_ldflags) +sierra_la_LIBADD = $(camlib_libadd) + +sierra_la_CPPFLAGS += $(LIBEXIF_CFLAGS) +sierra_la_LIBADD += $(LIBEXIF_LIBS) diff --git a/camlibs/sipix/Makefile-files b/camlibs/sipix/Makefile-files index 3fa51087e..c002e674a 100644 --- a/camlibs/sipix/Makefile-files +++ b/camlibs/sipix/Makefile-files @@ -1,29 +1,45 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/blink.c +EXTRA_DIST += %reldir%/blink.txt +EXTRA_DIST += %reldir%/blink2.txt +EXTRA_DIST += %reldir%/web2.html +EXTRA_DIST += %reldir%/xjpeg.c -EXTRA_DIST += sipix/web2.html sipix/blink.c sipix/blink.txt \ - sipix/xjpeg.c sipix/blink2.txt sipix/ChangeLog # Seems to be obsolete -EXTRA_LTLIBRARIES += sipix_blink.la +EXTRA_LTLIBRARIES += sipix_blink.la + +sipix_blink_la_SOURCES = %reldir%/blink.c + +sipix_blink_la_CFLAGS = $(camlib_cflags) +sipix_blink_la_CPPFLAGS = $(camlib_cppflags) +sipix_blink_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink_la_LDFLAGS = $(camlib_ldflags) +sipix_blink_la_LIBADD = $(camlib_libadd) + + +EXTRA_LTLIBRARIES += sipix_blink2.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) +sipix_blink2_la_SOURCES = %reldir%/blink2.c +sipix_blink2_la_CFLAGS = $(camlib_cflags) +sipix_blink2_la_CPPFLAGS = $(camlib_cppflags) +sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_blink2_la_LDFLAGS = $(camlib_ldflags) +sipix_blink2_la_LIBADD = $(camlib_libadd) -EXTRA_LTLIBRARIES += sipix_blink2.la +sipix_blink2_la_CPPFLAGS += $(LIBJPEG_CFLAGS) +sipix_blink2_la_LIBADD += $(LIBJPEG_LIBS) -sipix_blink2_la_SOURCES = sipix/blink2.c -sipix_blink2_la_LDFLAGS = $(camlib_ldflags) -sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies) -sipix_blink2_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBJPEG_CFLAGS) -sipix_blink2_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS) +EXTRA_LTLIBRARIES += sipix_web2.la -EXTRA_LTLIBRARIES += sipix_web2.la +sipix_web2_la_SOURCES = %reldir%/web2.c -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) +sipix_web2_la_CFLAGS = $(camlib_cflags) +sipix_web2_la_CPPFLAGS = $(camlib_cppflags) +sipix_web2_la_DEPENDENCIES = $(camlib_dependencies) +sipix_web2_la_LDFLAGS = $(camlib_ldflags) +sipix_web2_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/smal/Makefile-files b/camlibs/smal/Makefile-files index 4af5a8265..5b232d586 100644 --- a/camlibs/smal/Makefile-files +++ b/camlibs/smal/Makefile-files @@ -1,13 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += smal/README.smal smal/ChangeLog -camlibdoc_DATA += smal/README.smal +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += smal.la +EXTRA_DIST += %reldir%/README.smal +camlibdoc_DATA += %reldir%/README.smal -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) + +EXTRA_LTLIBRARIES += smal.la + +smal_la_SOURCES = +smal_la_SOURCES += %reldir%/smal.c +smal_la_SOURCES += %reldir%/smal.h +smal_la_SOURCES += %reldir%/ultrapocket.c +smal_la_SOURCES += %reldir%/ultrapocket.h + +smal_la_CFLAGS = $(camlib_cflags) +smal_la_CPPFLAGS = $(camlib_cppflags) +smal_la_DEPENDENCIES = $(camlib_dependencies) +smal_la_LDFLAGS = $(camlib_ldflags) +smal_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonix/Makefile-files b/camlibs/sonix/Makefile-files index d86c75065..f69e1e061 100644 --- a/camlibs/sonix/Makefile-files +++ b/camlibs/sonix/Makefile-files @@ -1,14 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += sonix/README.sonix sonix/ChangeLog -camlibdoc_DATA += sonix/README.sonix +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += sonix.la +EXTRA_DIST += %reldir%/README.sonix +camlibdoc_DATA += %reldir%/README.sonix -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) + +EXTRA_LTLIBRARIES += sonix.la + +sonix_la_SOURCES = +sonix_la_SOURCES += %reldir%/library.c +sonix_la_SOURCES += %reldir%/sonix.c +sonix_la_SOURCES += %reldir%/sonix.h +sonix_la_SOURCES += %reldir%/sakar-avi-header.h + +sonix_la_CFLAGS = $(camlib_cflags) +sonix_la_CPPFLAGS = $(camlib_cppflags) +sonix_la_DEPENDENCIES = $(camlib_dependencies) +sonix_la_LDFLAGS = $(camlib_ldflags) +sonix_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonydscf1/Makefile-files b/camlibs/sonydscf1/Makefile-files index b1f5d90d1..839089675 100644 --- a/camlibs/sonydscf1/Makefile-files +++ b/camlibs/sonydscf1/Makefile-files @@ -1,14 +1,21 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += sonydscf1/README.sonydscf1 sonydscf1/ChangeLog -camlibdoc_DATA += sonydscf1/README.sonydscf1 +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += sony_dscf1.la +EXTRA_DIST += %reldir%/README.sonydscf1 +camlibdoc_DATA += %reldir%/README.sonydscf1 -sony_dscf1_la_SOURCES = \ - sonydscf1/command.c sonydscf1/command.h \ - sonydscf1/sonydscf1.c sonydscf1/pmp.h -sony_dscf1_la_LDFLAGS = $(camlib_ldflags) -sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies) -sony_dscf1_la_LIBADD = $(camlib_libadd) +EXTRA_LTLIBRARIES += sony_dscf1.la + +sony_dscf1_la_SOURCES = +sony_dscf1_la_SOURCES += %reldir%/command.c +sony_dscf1_la_SOURCES += %reldir%/command.h +sony_dscf1_la_SOURCES += %reldir%/sonydscf1.c +sony_dscf1_la_SOURCES += %reldir%/pmp.h + +sony_dscf1_la_CFLAGS = $(camlib_cflags) +sony_dscf1_la_CPPFLAGS = $(camlib_cppflags) +sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies) +sony_dscf1_la_LDFLAGS = $(camlib_ldflags) +sony_dscf1_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonydscf55/Makefile-files b/camlibs/sonydscf55/Makefile-files index 4e82dcd1e..96c543f5f 100644 --- a/camlibs/sonydscf55/Makefile-files +++ b/camlibs/sonydscf55/Makefile-files @@ -1,13 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += sony_dscf55.la -EXTRA_DIST += sonydscf55/ChangeLog sonydscf55/TODO +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/TODO -sony_dscf55_la_SOURCES = -sony_dscf55_la_SOURCES += sonydscf55/sony.c -sony_dscf55_la_SOURCES += sonydscf55/sony.h -sony_dscf55_la_SOURCES += sonydscf55/camera.c -sony_dscf55_la_LDFLAGS = $(camlib_ldflags) -sony_dscf55_la_DEPENDENCIES = $(camlib_dependencies) -sony_dscf55_la_LIBADD = $(camlib_libadd) +EXTRA_LTLIBRARIES += sony_dscf55.la + +sony_dscf55_la_SOURCES = +sony_dscf55_la_SOURCES += %reldir%/sony.c +sony_dscf55_la_SOURCES += %reldir%/sony.h +sony_dscf55_la_SOURCES += %reldir%/camera.c + +sony_dscf55_la_CFLAGS = $(camlib_cflags) +sony_dscf55_la_CPPFLAGS = $(camlib_cppflags) +sony_dscf55_la_DEPENDENCIES = $(camlib_dependencies) +sony_dscf55_la_LDFLAGS = $(camlib_ldflags) +sony_dscf55_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/soundvision/Makefile-files b/camlibs/soundvision/Makefile-files index 459dfe5dc..fb529f8ce 100644 --- a/camlibs/soundvision/Makefile-files +++ b/camlibs/soundvision/Makefile-files @@ -1,15 +1,24 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += soundvision/README.soundvision soundvision/BUGS soundvision/ChangeLog -camlibdoc_DATA += soundvision/README.soundvision +EXTRA_DIST += %reldir%/BUGS +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_LTLIBRARIES += soundvision.la +EXTRA_DIST += %reldir%/README.soundvision +camlibdoc_DATA += %reldir%/README.soundvision -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) + +EXTRA_LTLIBRARIES += soundvision.la + +soundvision_la_SOURCES = +soundvision_la_SOURCES += %reldir%/soundvision.c +soundvision_la_SOURCES += %reldir%/agfa_cl18.c +soundvision_la_SOURCES += %reldir%/tiger_fastflicks.c +soundvision_la_SOURCES += %reldir%/commands.c +soundvision_la_SOURCES += %reldir%/commands.h +soundvision_la_SOURCES += %reldir%/soundvision.h + +soundvision_la_CFLAGS = $(camlib_cflags) +soundvision_la_CPPFLAGS = $(camlib_cppflags) +soundvision_la_DEPENDENCIES = $(camlib_dependencies) +soundvision_la_LDFLAGS = $(camlib_ldflags) +soundvision_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/spca50x/Makefile-files b/camlibs/spca50x/Makefile-files index b9e3d702a..4c849a4e0 100644 --- a/camlibs/spca50x/Makefile-files +++ b/camlibs/spca50x/Makefile-files @@ -1,18 +1,31 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += spca50x/ChangeLog.benq spca50x/ChangeLog.gsmart spca50x/ChangeLog.spca504_flash spca50x/lsusb-v spca50x/README.spca50x spca50x/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog.benq +EXTRA_DIST += %reldir%/ChangeLog.gsmart +EXTRA_DIST += %reldir%/ChangeLog.spca504_flash +EXTRA_DIST += %reldir%/lsusb-v -camlibdoc_DATA += spca50x/README.spca50x +EXTRA_DIST += %reldir%/README.spca50x +camlibdoc_DATA += %reldir%/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) +EXTRA_LTLIBRARIES += spca50x.la + +spca50x_la_SOURCES = +spca50x_la_SOURCES += %reldir%/spca50x.c +spca50x_la_SOURCES += %reldir%/spca50x.h +spca50x_la_SOURCES += %reldir%/spca50x-flash.c +spca50x_la_SOURCES += %reldir%/spca50x-flash.h +spca50x_la_SOURCES += %reldir%/spca50x-sdram.c +spca50x_la_SOURCES += %reldir%/spca50x-sdram.h +spca50x_la_SOURCES += %reldir%/library.c +spca50x_la_SOURCES += %reldir%/spca50x-jpeg-header.h +spca50x_la_SOURCES += %reldir%/spca50x-registers.h +spca50x_la_SOURCES += %reldir%/spca50x-avi-header.h + +spca50x_la_CFLAGS = $(camlib_cflags) +spca50x_la_CPPFLAGS = $(camlib_cppflags) +spca50x_la_DEPENDENCIES = $(camlib_dependencies) +spca50x_la_LDFLAGS = $(camlib_ldflags) +spca50x_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sq905/Makefile-files b/camlibs/sq905/Makefile-files index 564ebca3b..de1e3835b 100644 --- a/camlibs/sq905/Makefile-files +++ b/camlibs/sq905/Makefile-files @@ -1,11 +1,25 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += sq905/README.913C sq905/README.sq905 sq905/ChangeLog sq905/TODO -camlibdoc_DATA += sq905/README.913C sq905/README.sq905 +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/TODO -EXTRA_LTLIBRARIES += sq905.la +EXTRA_DIST += %reldir%/README.913C +camlibdoc_DATA += %reldir%/README.913C -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) +EXTRA_DIST += %reldir%/README.sq905 +camlibdoc_DATA += %reldir%/README.sq905 + + +EXTRA_LTLIBRARIES += sq905.la + +sq905_la_SOURCES = +sq905_la_SOURCES += %reldir%/library.c +sq905_la_SOURCES += %reldir%/sq905.c +sq905_la_SOURCES += %reldir%/sq905.h +sq905_la_SOURCES += %reldir%/postprocess.c + +sq905_la_CFLAGS = $(camlib_cflags) +sq905_la_CPPFLAGS = $(camlib_cppflags) +sq905_la_DEPENDENCIES = $(camlib_dependencies) +sq905_la_LDFLAGS = $(camlib_ldflags) +sq905_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/st2205/Makefile-files b/camlibs/st2205/Makefile-files index 8a85bfb02..6a30fc04d 100644 --- a/camlibs/st2205/Makefile-files +++ b/camlibs/st2205/Makefile-files @@ -1,16 +1,33 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += st2205/README.st2205-compression st2205/README.st2205 -camlibdoc_DATA += st2205/README.st2205-compression st2205/README.st2205 +EXTRA_DIST += %reldir%/README.st2205-compression +camlibdoc_DATA += %reldir%/README.st2205-compression -EXTRA_LTLIBRARIES += st2205.la +EXTRA_DIST += %reldir%/README.st2205 +camlibdoc_DATA += %reldir%/README.st2205 -st2205_la_SOURCES = st2205/library.c st2205/st2205.c st2205/st2205.h st2205/st2205_decode.c st2205/st2205_tables.c -st2205_la_LDFLAGS = $(camlib_ldflags) -st2205_la_DEPENDENCIES = $(camlib_dependencies) -st2205_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LTLIBICONV) -st2205_la_CFLAGS = @LIBGD_CFLAGS@ + +EXTRA_LTLIBRARIES += st2205.la + +st2205_la_SOURCES = + +st2205_la_SOURCES += %reldir%/library.c +st2205_la_SOURCES += %reldir%/st2205.c +st2205_la_SOURCES += %reldir%/st2205.h +st2205_la_SOURCES += %reldir%/st2205_decode.c +st2205_la_SOURCES += %reldir%/st2205_tables.c + +st2205_la_CFLAGS = $(camlib_cflags) +st2205_la_CPPFLAGS = $(camlib_cppflags) +st2205_la_DEPENDENCIES = $(camlib_dependencies) +st2205_la_LDFLAGS = $(camlib_ldflags) +st2205_la_LIBADD = $(camlib_libadd) + +st2205_la_CFLAGS += @LIBGD_CFLAGS@ +st2205_la_LIBADD += @LIBGD_LIBS@ + +st2205_la_LIBADD += $(LTLIBICONV) # On systems such as mingw/Windows, mmap(2) is not part of the # standard library and needs an explicit library to link against. -st2205_la_LIBADD += $(MMAP_LIBS) +st2205_la_LIBADD += $(MMAP_LIBS) diff --git a/camlibs/stv0674/Makefile-files b/camlibs/stv0674/Makefile-files index ac6d099d5..3ea977d54 100644 --- a/camlibs/stv0674/Makefile-files +++ b/camlibs/stv0674/Makefile-files @@ -1,12 +1,19 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += stv0674/Protocol stv0674/Changelog +EXTRA_DIST += %reldir%/Changelog +EXTRA_DIST += %reldir%/Protocol -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) +EXTRA_LTLIBRARIES += stv0674.la + +stv0674_la_SOURCES = +stv0674_la_SOURCES += %reldir%/stv0674.c +stv0674_la_SOURCES += %reldir%/stv0674.h +stv0674_la_SOURCES += %reldir%/library.c +stv0674_la_SOURCES += %reldir%/library.h + +stv0674_la_CFLAGS = $(camlib_cflags) +stv0674_la_CPPFLAGS = $(camlib_cppflags) +stv0674_la_DEPENDENCIES = $(camlib_dependencies) +stv0674_la_LDFLAGS = $(camlib_ldflags) +stv0674_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/stv0680/Makefile-files b/camlibs/stv0680/Makefile-files index 0c5a122ee..1d2f977ca 100644 --- a/camlibs/stv0680/Makefile-files +++ b/camlibs/stv0680/Makefile-files @@ -1,19 +1,30 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += \ - stv0680/CREDITS stv0680/ChangeLog stv0680/LICENCE \ - stv0680/README.pdf \ - stv0680/680_commands_and_communication_sdk.pdf.gz +EXTRA_DIST += %reldir%/680_commands_and_communication_sdk.pdf.gz +EXTRA_DIST += %reldir%/CREDITS +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/LICENCE +EXTRA_DIST += %reldir%/README.pdf -EXTRA_LTLIBRARIES += stv0680.la -stv0680_la_SOURCES = \ - stv0680/stv0680.c stv0680/stv0680.h \ - stv0680/library.c stv0680/library.h \ - stv0680/stv0680-bayer.c stv0680/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) +EXTRA_LTLIBRARIES += stv0680.la + +stv0680_la_SOURCES = +stv0680_la_SOURCES += %reldir%/stv0680.c +stv0680_la_SOURCES += %reldir%/stv0680.h +stv0680_la_SOURCES += %reldir%/library.c +stv0680_la_SOURCES += %reldir%/library.h +stv0680_la_SOURCES += %reldir%/stv0680-bayer.c +stv0680_la_SOURCES += %reldir%/stv0680-bayer.h +stv0680_la_SOURCES += %reldir%/sharpen.c +stv0680_la_SOURCES += %reldir%/sharpen.h +stv0680_la_SOURCES += %reldir%/saturate.c +stv0680_la_SOURCES += %reldir%/saturate.h +stv0680_la_SOURCES += %reldir%/demosaic_sharpen.h +stv0680_la_SOURCES += %reldir%/demosaic_sharpen.c + +stv0680_la_CFLAGS = $(camlib_cflags) +stv0680_la_CPPFLAGS = $(camlib_cppflags) +stv0680_la_DEPENDENCIES = $(camlib_dependencies) +stv0680_la_LDFLAGS = $(camlib_ldflags) +stv0680_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sx330z/Makefile-files b/camlibs/sx330z/Makefile-files index 462ba0ec5..7ed3c2a1a 100644 --- a/camlibs/sx330z/Makefile-files +++ b/camlibs/sx330z/Makefile-files @@ -1,9 +1,17 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_LTLIBRARIES += sx330z.la -EXTRA_DIST += sx330z/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -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) + +EXTRA_LTLIBRARIES += sx330z.la + +sx330z_la_SOURCES = +sx330z_la_SOURCES += %reldir%/library.c +sx330z_la_SOURCES += %reldir%/sx330z.c +sx330z_la_SOURCES += %reldir%/sx330z.h + +sx330z_la_CFLAGS = $(camlib_cflags) +sx330z_la_CPPFLAGS = $(camlib_cppflags) +sx330z_la_DEPENDENCIES = $(camlib_dependencies) +sx330z_la_LDFLAGS = $(camlib_ldflags) +sx330z_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/template/Makefile-files b/camlibs/template/Makefile-files index 1e7796827..50932bc67 100644 --- a/camlibs/template/Makefile-files +++ b/camlibs/template/Makefile-files @@ -1,4 +1,4 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- # 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 @@ -16,15 +16,19 @@ # Also, do not forget to add any *.c source files containing # translated strings to POTFILES.in. -EXTRA_DIST += template/ChangeLog +EXTRA_DIST += %reldir%/ChangeLog -EXTRA_DIST += template/README.template -noinst_DATA += template/README.template +EXTRA_DIST += %reldir%/README.template +noinst_DATA += %reldir%/README.template -noinst_LTLIBRARIES += template.la +noinst_LTLIBRARIES += template.la -template_la_SOURCES = template/template.c -template_la_CFLAGS = $(AM_CFLAGS) $(NO_UNUSED_CFLAGS) $(CFLAGS) -template_la_LDFLAGS = $(camlib_ldflags) -template_la_DEPENDENCIES = $(camlib_dependencies) -template_la_LIBADD = $(camlib_libadd) +template_la_SOURCES = %reldir%/template.c + +template_la_CFLAGS = $(camlib_cflags) +template_la_CPPFLAGS = $(camlib_cppflags) +template_la_DEPENDENCIES = $(camlib_dependencies) +template_la_LDFLAGS = $(camlib_ldflags) +template_la_LIBADD = $(camlib_libadd) + +template_la_CFLAGS += $(NO_UNUSED_CFLAGS) diff --git a/camlibs/topfield/Makefile-files b/camlibs/topfield/Makefile-files index 34d7c79fc..94eea9af7 100644 --- a/camlibs/topfield/Makefile-files +++ b/camlibs/topfield/Makefile-files @@ -1,9 +1,25 @@ -# -*- Makefile -*- - -EXTRA_LTLIBRARIES += topfield.la -EXTRA_DIST += topfield/ChangeLog -topfield_la_SOURCES = topfield/crc16.c topfield/crc16.h topfield/tf_bytes.c topfield/tf_bytes.h topfield/mjd.c topfield/mjd.h \ - topfield/puppy.c topfield/usb_io.h topfield/usb_io.c -topfield_la_LDFLAGS = $(camlib_ldflags) -topfield_la_DEPENDENCIES = $(camlib_dependencies) -topfield_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) +# -*- Makefile-automake -*- + +EXTRA_DIST += %reldir%/ChangeLog + + +EXTRA_LTLIBRARIES += topfield.la + +topfield_la_SOURCES = +topfield_la_SOURCES += %reldir%/crc16.c +topfield_la_SOURCES += %reldir%/crc16.h +topfield_la_SOURCES += %reldir%/tf_bytes.c +topfield_la_SOURCES += %reldir%/tf_bytes.h +topfield_la_SOURCES += %reldir%/mjd.c +topfield_la_SOURCES += %reldir%/mjd.h +topfield_la_SOURCES += %reldir%/puppy.c +topfield_la_SOURCES += %reldir%/usb_io.h +topfield_la_SOURCES += %reldir%/usb_io.c + +topfield_la_CFLAGS = $(camlib_cflags) +topfield_la_CPPFLAGS = $(camlib_cppflags) +topfield_la_DEPENDENCIES = $(camlib_dependencies) +topfield_la_LDFLAGS = $(camlib_ldflags) +topfield_la_LIBADD = $(camlib_libadd) + +topfield_la_LIBADD += $(LTLIBICONV) diff --git a/camlibs/toshiba/pdrm11/Makefile-files b/camlibs/toshiba/pdrm11/Makefile-files index af1b1abd8..1519448b4 100644 --- a/camlibs/toshiba/pdrm11/Makefile-files +++ b/camlibs/toshiba/pdrm11/Makefile-files @@ -1,13 +1,18 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += toshiba/pdrm11/README.toshiba-pdrm11 -camlibdoc_DATA += toshiba/pdrm11/README.toshiba-pdrm11 +EXTRA_DIST += %reldir%/README.toshiba-pdrm11 +camlibdoc_DATA += %reldir%/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) +EXTRA_LTLIBRARIES += toshiba_pdrm11.la + +toshiba_pdrm11_la_SOURCES = +toshiba_pdrm11_la_SOURCES += %reldir%/library.c +toshiba_pdrm11_la_SOURCES += %reldir%/pdrm11.c +toshiba_pdrm11_la_SOURCES += %reldir%/pdrm11.h + +toshiba_pdrm11_la_CFLAGS = $(camlib_cflags) +toshiba_pdrm11_la_CPPFLAGS = $(camlib_cppflags) +toshiba_pdrm11_la_DEPENDENCIES = $(camlib_dependencies) +toshiba_pdrm11_la_LDFLAGS = $(camlib_ldflags) +toshiba_pdrm11_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/tp6801/Makefile-files b/camlibs/tp6801/Makefile-files index fa5260d63..f3527495b 100644 --- a/camlibs/tp6801/Makefile-files +++ b/camlibs/tp6801/Makefile-files @@ -1,12 +1,23 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += tp6801/README.tp6801 tp6801/tp6801-dump.c -camlibdoc_DATA += tp6801/README.tp6801 +EXTRA_DIST += %reldir%/tp6801-dump.c -EXTRA_LTLIBRARIES += tp6801.la +EXTRA_DIST += %reldir%/README.tp6801 +camlibdoc_DATA += %reldir%/README.tp6801 -tp6801_la_SOURCES = tp6801/library.c tp6801/tp6801.c tp6801/tp6801.h -tp6801_la_LDFLAGS = $(camlib_ldflags) -tp6801_la_DEPENDENCIES = $(camlib_dependencies) -tp6801_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ -tp6801_la_CFLAGS = @LIBGD_CFLAGS@ + +EXTRA_LTLIBRARIES += tp6801.la + +tp6801_la_SOURCES = +tp6801_la_SOURCES += %reldir%/library.c +tp6801_la_SOURCES += %reldir%/tp6801.c +tp6801_la_SOURCES += %reldir%/tp6801.h + +tp6801_la_CFLAGS = $(camlib_cflags) +tp6801_la_CPPFLAGS = $(camlib_cppflags) +tp6801_la_DEPENDENCIES = $(camlib_dependencies) +tp6801_la_LDFLAGS = $(camlib_ldflags) +tp6801_la_LIBADD = $(camlib_libadd) + +tp6801_la_CPPFLAGS += @LIBGD_CFLAGS@ +tp6801_la_LIBADD += @LIBGD_LIBS@ diff --git a/configure.ac b/configure.ac index f22ceba16..5f1674648 100644 --- a/configure.ac +++ b/configure.ac @@ -660,7 +660,6 @@ AC_CONFIG_FILES([ gphoto2-config camlibs/Makefile camlibs/canon/doc/Makefile - camlibs/konica/localization/Makefile libgphoto2/Makefile libgphoto2.pc libgphoto2-uninstalled.pc |