diff options
223 files changed, 464 insertions, 484 deletions
@@ -35,7 +35,7 @@ Every source file (file_name.c) should have the following layout: #include <std*.h> (i.e. stdlib, stdio, string, etc.) -#include <gphoto2-*.h> (what you need) +#include <gphoto2/gphoto2-*.h> (what you need) /* Source code here. */ diff --git a/Makefile.am b/Makefile.am index 27fdb40b1..1e16e47b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,32 +12,7 @@ SUBDIRS = . @subdirs@ libgphoto2 camlibs tests po bindings packaging doc doc_DATA = AUTHORS COPYING README CHANGES NEWS -# Create gphoto2/ directory and copy all header files into it. -# -# Reasons to do that: -# - Both libgphoto2 and libgphoto2_port install their *.h files -# into $(includedir)/gphoto2 -# - Example programs can use #include <gphoto2/gphoto2-foobar.h> -# like any libgphoto2 frontend is supposed to do. -# (Promotes clean API use) -# - Helps build libgphoto2 frontends against libgphoto2 without -# installing libgphoto2 first. -# -# This functionality requires the "." to be the first item in SUBDIRS -# and makes it possible to consistently use #include <gphoto2/stuff.h>. - -all-local: - @echo "Creating/Updating gphoto2/ directory with gphoto2*.h files" - @rm -f gphoto2/gphoto2*.h - @mkdir -p gphoto2 - @cp \ - libgphoto2/gphoto2*.h \ - libgphoto2_port/libgphoto2_port/gphoto2*.h \ - $(srcdir)/libgphoto2/gphoto2*.h \ - $(srcdir)/libgphoto2_port/libgphoto2_port/gphoto2*.h \ - gphoto2/ > /dev/null 2>&1 \ - || true - +# Remove obsolete directory of copied/symlinked header files clean-local: rm -f gphoto2/gphoto2*.h rmdir gphoto2 || true diff --git a/camlibs/adc65/adc65.c b/camlibs/adc65/adc65.c index 545135c4c..5fc8ca200 100644 --- a/camlibs/adc65/adc65.c +++ b/camlibs/adc65/adc65.c @@ -10,8 +10,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-abilities-list.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-abilities-list.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/adc65/library.c b/camlibs/adc65/library.c index 25066bad4..08c3f34fc 100644 --- a/camlibs/adc65/library.c +++ b/camlibs/adc65/library.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "adc65.h" diff --git a/camlibs/agfa-cl20/agfa_cl20.c b/camlibs/agfa-cl20/agfa_cl20.c index 697b0b2b1..ba9072094 100644 --- a/camlibs/agfa-cl20/agfa_cl20.c +++ b/camlibs/agfa-cl20/agfa_cl20.c @@ -29,9 +29,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/aox/aox.c b/camlibs/aox/aox.c index e876ab330..dc663a23c 100644 --- a/camlibs/aox/aox.c +++ b/camlibs/aox/aox.c @@ -25,8 +25,8 @@ #include <fcntl.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "aox.h" diff --git a/camlibs/aox/aox.h b/camlibs/aox/aox.h index 83351f9e3..077bc769e 100644 --- a/camlibs/aox/aox.h +++ b/camlibs/aox/aox.h @@ -21,7 +21,7 @@ #ifndef __AOX_H__ #define __AOX_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> typedef unsigned char Info; diff --git a/camlibs/aox/library.c b/camlibs/aox/library.c index f4972464c..267b1f307 100644 --- a/camlibs/aox/library.c +++ b/camlibs/aox/library.c @@ -27,7 +27,7 @@ #include <bayer.h> #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -44,7 +44,7 @@ #endif #include "aox.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "aox" diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c index e4a37f287..16130f84a 100644 --- a/camlibs/barbie/barbie.c +++ b/camlibs/barbie/barbie.c @@ -4,7 +4,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/barbie/library.c b/camlibs/barbie/library.c index 8b4a4da7a..d3d13b0ed 100644 --- a/camlibs/barbie/library.c +++ b/camlibs/barbie/library.c @@ -4,7 +4,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "barbie.h" #define GP_MODULE "barbie" diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 25e87a57f..5634297f2 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -37,8 +37,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c index 2a5f761b5..89d965846 100644 --- a/camlibs/canon/library.c +++ b/camlibs/canon/library.c @@ -39,7 +39,7 @@ #include <locale.h> #endif -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index afeb06f5c..c7c26c8a2 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <ctype.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 758b260b6..60c800b3b 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -48,7 +48,7 @@ # define N_(String) (String) #endif -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "usb.h" #include "canon.h" diff --git a/camlibs/canon/util.c b/camlibs/canon/util.c index 1b6ebf404..4e134552a 100644 --- a/camlibs/canon/util.c +++ b/camlibs/canon/util.c @@ -20,8 +20,8 @@ #include <time.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port-log.h> #include "canon.h" #include "util.h" diff --git a/camlibs/canon/util.h b/camlibs/canon/util.h index 73646bffd..3f4124e12 100644 --- a/camlibs/canon/util.h +++ b/camlibs/canon/util.h @@ -8,7 +8,7 @@ #ifndef _CANON_UTIL_H #define _CANON_UTIL_H -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2-endian.h> #ifndef TRUE #define TRUE 1 diff --git a/camlibs/casio/camtojpeg.c b/camlibs/casio/camtojpeg.c index 70fb3433b..c10464463 100644 --- a/camlibs/casio/camtojpeg.c +++ b/camlibs/casio/camtojpeg.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "cam2jpgtab.h" #include "jpegtab_f.h" diff --git a/camlibs/casio/casio-qv-commands.h b/camlibs/casio/casio-qv-commands.h index 047406348..af502e473 100644 --- a/camlibs/casio/casio-qv-commands.h +++ b/camlibs/casio/casio-qv-commands.h @@ -21,7 +21,7 @@ #ifndef __CASIO_QV_COMMANDS_H__ #define __CASIO_QV_COMMANDS_H__ -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> int QVping (Camera *camera); diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c index ab0f5db08..7ca3d41a8 100644 --- a/camlibs/casio/casio-qv.c +++ b/camlibs/casio/casio-qv.c @@ -20,7 +20,7 @@ #include "config.h" -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include <stdlib.h> #include <stdio.h> diff --git a/camlibs/casio/ycctoppm.c b/camlibs/casio/ycctoppm.c index d900aca1d..569d24e6b 100644 --- a/camlibs/casio/ycctoppm.c +++ b/camlibs/casio/ycctoppm.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "ycctoppm.h" diff --git a/camlibs/clicksmart310/clicksmart.c b/camlibs/clicksmart310/clicksmart.c index 0b619450e..32e937b49 100644 --- a/camlibs/clicksmart310/clicksmart.c +++ b/camlibs/clicksmart310/clicksmart.c @@ -28,8 +28,8 @@ #include <string.h> #include <math.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "clicksmart.h" #include "spca50x-jpeg-header.h" diff --git a/camlibs/clicksmart310/clicksmart.h b/camlibs/clicksmart310/clicksmart.h index e235d2d49..b4cae529e 100644 --- a/camlibs/clicksmart310/clicksmart.h +++ b/camlibs/clicksmart310/clicksmart.h @@ -23,7 +23,7 @@ #ifndef __CLICKSMART_H__ #define __CLICKSMART_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> struct _CameraPrivateLibrary { unsigned char *catalog; diff --git a/camlibs/clicksmart310/library.c b/camlibs/clicksmart310/library.c index 349ddc78f..cc35f9f7a 100644 --- a/camlibs/clicksmart310/library.c +++ b/camlibs/clicksmart310/library.c @@ -23,8 +23,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #define JPEG_QCIF_FORMAT 0x22 #define JPEG_CIF_FORMAT 0x21 diff --git a/camlibs/digigr8/digi_postprocess.c b/camlibs/digigr8/digi_postprocess.c index e33b3a278..eae165a59 100644 --- a/camlibs/digigr8/digi_postprocess.c +++ b/camlibs/digigr8/digi_postprocess.c @@ -27,8 +27,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "digigr8.h" #define GP_MODULE "digigr8" diff --git a/camlibs/digigr8/digigr8.c b/camlibs/digigr8/digigr8.c index d9b07a774..f01d56783 100644 --- a/camlibs/digigr8/digigr8.c +++ b/camlibs/digigr8/digigr8.c @@ -27,8 +27,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "digigr8.h" #define GP_MODULE "digigr8" diff --git a/camlibs/digigr8/digigr8.h b/camlibs/digigr8/digigr8.h index 04a60fc6d..6fd4fd11f 100644 --- a/camlibs/digigr8/digigr8.h +++ b/camlibs/digigr8/digigr8.h @@ -16,7 +16,7 @@ #ifndef __DIGIGR8_H__ #define __DIGIGR8_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> struct _CameraPrivateLibrary { unsigned char *catalog; diff --git a/camlibs/digigr8/library.c b/camlibs/digigr8/library.c index 74018fef4..c80537fd5 100644 --- a/camlibs/digigr8/library.c +++ b/camlibs/digigr8/library.c @@ -28,7 +28,7 @@ #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -46,7 +46,7 @@ #include "digigr8.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "digigr8" diff --git a/camlibs/digita/commands.c b/camlibs/digita/commands.c index c818f6a90..24059469f 100644 --- a/camlibs/digita/commands.c +++ b/camlibs/digita/commands.c @@ -37,7 +37,7 @@ #define GP_MODULE "digita" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> static void build_command(struct digita_command *cmd, int length, short command) { diff --git a/camlibs/digita/digita.c b/camlibs/digita/digita.c index 14ffb41f1..235295ee5 100644 --- a/camlibs/digita/digita.c +++ b/camlibs/digita/digita.c @@ -36,8 +36,8 @@ #define GP_MODULE "digita" -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/digita/digita.h b/camlibs/digita/digita.h index ace5aa5bf..77eadf288 100644 --- a/camlibs/digita/digita.h +++ b/camlibs/digita/digita.h @@ -22,9 +22,9 @@ #ifndef DIGITA_H #define DIGITA_H -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define DIGITA_GET_PRODUCT_INFO 0x01 #define DIGITA_GET_IMAGE_SPECS 0x02 diff --git a/camlibs/digita/serial.c b/camlibs/digita/serial.c index b3711e4d0..abd96721a 100644 --- a/camlibs/digita/serial.c +++ b/camlibs/digita/serial.c @@ -38,7 +38,7 @@ #define GP_MODULE "digita" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define MAX_BEACON_RETRIES 5 #define MAX_BEACON_TIMEOUTS 2 diff --git a/camlibs/digita/usb.c b/camlibs/digita/usb.c index 4db7bb1cc..ebe512a7b 100644 --- a/camlibs/digita/usb.c +++ b/camlibs/digita/usb.c @@ -28,7 +28,7 @@ #include <errno.h> #include <string.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #include "digita.h" diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index 6bf4443e9..2db1b6def 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -29,7 +29,7 @@ #include <string.h> #include <_stdint.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/dimera/mesalib.c b/camlibs/dimera/mesalib.c index cbdac223d..dd35368c8 100644 --- a/camlibs/dimera/mesalib.c +++ b/camlibs/dimera/mesalib.c @@ -29,8 +29,8 @@ #include <sys/time.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #define GP_MODULE "dimera" #define debuglog(e) GP_DEBUG( "%s", (e)) diff --git a/camlibs/dimera/mesalib.h b/camlibs/dimera/mesalib.h index 7e155627f..91f69191f 100644 --- a/camlibs/dimera/mesalib.h +++ b/camlibs/dimera/mesalib.h @@ -13,7 +13,7 @@ #define MESALIB_H #include <_stdint.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define CHECK(result) {int res = (result); if (res < 0) return (res);} diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c index 219ce6541..5a289173e 100644 --- a/camlibs/directory/directory.c +++ b/camlibs/directory/directory.c @@ -32,10 +32,10 @@ #include <libexif/exif-data.h> #endif -#include <gphoto2-setting.h> -#include <gphoto2-library.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-setting.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c index 8eb79c2fa..15c34a41c 100644 --- a/camlibs/enigma13/enigma13.c +++ b/camlibs/enigma13/enigma13.c @@ -26,10 +26,10 @@ #include <string.h> #include <unistd.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> -#include <gphoto2-result.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-endian.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 6c4c2df04..f1ffd382f 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -46,7 +46,7 @@ #include <stdlib.h> #include <stdio.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/fuji/fuji.h b/camlibs/fuji/fuji.h index c4f6e5814..ccc74c02e 100644 --- a/camlibs/fuji/fuji.h +++ b/camlibs/fuji/fuji.h @@ -21,8 +21,8 @@ #ifndef __FUJI_H__ #define __FUJI_H__ -#include <gphoto2-context.h> -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-context.h> +#include <gphoto2/gphoto2-camera.h> typedef enum _FujiCmd FujiCmd; enum _FujiCmd { diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c index a3c6ec312..6383a3d67 100644 --- a/camlibs/fuji/library.c +++ b/camlibs/fuji/library.c @@ -25,9 +25,9 @@ #include <stdio.h> #include <time.h> -#include <gphoto2-library.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> #include "fuji.h" diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c index 62102233b..d076cbdb3 100644 --- a/camlibs/gsmart300/gsmart300.c +++ b/camlibs/gsmart300/gsmart300.c @@ -30,8 +30,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "gsmart300.h" #include "gsmart300-jpeg-header.h" diff --git a/camlibs/gsmart300/gsmart300.h b/camlibs/gsmart300/gsmart300.h index 6be898334..a0ba451f5 100644 --- a/camlibs/gsmart300/gsmart300.h +++ b/camlibs/gsmart300/gsmart300.h @@ -28,7 +28,7 @@ #ifndef __GSMART300_H__ #define __GSMART300_H__ #include <_stdint.h> -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define FLASH_PAGE_SIZE_300 0x200 #define GSMART_FILE_TYPE_IMAGE 0x00 diff --git a/camlibs/gsmart300/library.c b/camlibs/gsmart300/library.c index 3404aec2a..7a68433e8 100644 --- a/camlibs/gsmart300/library.c +++ b/camlibs/gsmart300/library.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c index 398f7d46d..59b81f8ac 100644 --- a/camlibs/hp215/hp215.c +++ b/camlibs/hp215/hp215.c @@ -63,9 +63,9 @@ #include <unistd.h> #include <stdlib.h> -#include <gphoto2-port-log.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "crctab.h" diff --git a/camlibs/iclick/iclick.c b/camlibs/iclick/iclick.c index 80355b82d..841032a7b 100644 --- a/camlibs/iclick/iclick.c +++ b/camlibs/iclick/iclick.c @@ -32,8 +32,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "iclick.h" #define GP_MODULE "iclick" diff --git a/camlibs/iclick/iclick.h b/camlibs/iclick/iclick.h index 2b27a93ef..6d4f5fb08 100644 --- a/camlibs/iclick/iclick.h +++ b/camlibs/iclick/iclick.h @@ -24,7 +24,7 @@ #ifndef __ICLICK_H__ #define __ICLICK_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> /* A 'picture' is a single standalone picture. * A 'clip' is an autoshoot clip. diff --git a/camlibs/iclick/library.c b/camlibs/iclick/library.c index 84d1e2ffa..41744a2ab 100644 --- a/camlibs/iclick/library.c +++ b/camlibs/iclick/library.c @@ -29,7 +29,7 @@ #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -47,7 +47,7 @@ #include "iclick.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "iclick" diff --git a/camlibs/jamcam/jamcam.c b/camlibs/jamcam/jamcam.c index efd0b9eb9..a91d0eeac 100644 --- a/camlibs/jamcam/jamcam.c +++ b/camlibs/jamcam/jamcam.c @@ -29,7 +29,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include <bayer.h> #include <gamma.h> diff --git a/camlibs/jamcam/library.c b/camlibs/jamcam/library.c index b70477df4..0a57b4309 100644 --- a/camlibs/jamcam/library.c +++ b/camlibs/jamcam/library.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include <time.h> #include <unistd.h> #include <math.h> diff --git a/camlibs/jd11/jd11.c b/camlibs/jd11/jd11.c index b4ef765fa..0a11bcff7 100644 --- a/camlibs/jd11/jd11.c +++ b/camlibs/jd11/jd11.c @@ -24,8 +24,8 @@ #include <stdlib.h> #include <stdio.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c index 5fa8c2dcf..52f631934 100644 --- a/camlibs/jd11/serial.c +++ b/camlibs/jd11/serial.c @@ -25,8 +25,8 @@ #include <unistd.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include <bayer.h> diff --git a/camlibs/jd11/serial.h b/camlibs/jd11/serial.h index d0447e216..f50d58b6a 100644 --- a/camlibs/jd11/serial.h +++ b/camlibs/jd11/serial.h @@ -21,8 +21,8 @@ #ifndef _JD11_SERIAL_H #define _JD11_SERIAL_H -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> extern int jd11_index_reader(GPPort *port, CameraFilesystem *fs, GPContext *context); extern int jd11_get_image_full(Camera *camera,CameraFile *file,int nr,int raw, GPContext *context); diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c index 9b979f3f1..250e5564c 100644 --- a/camlibs/kodak/dc120/dc120.c +++ b/camlibs/kodak/dc120/dc120.c @@ -5,8 +5,8 @@ #include <string.h> #include <time.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index 036e51e95..9599b0cbe 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "dc120.h" #include "library.h" diff --git a/camlibs/kodak/dc210/dc210.c b/camlibs/kodak/dc210/dc210.c index 64a13554c..58bf29e2f 100644 --- a/camlibs/kodak/dc210/dc210.c +++ b/camlibs/kodak/dc210/dc210.c @@ -5,8 +5,8 @@ #include <string.h> #include <time.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index 7f59435ae..02d56313f 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "dc210.h" #include "library.h" diff --git a/camlibs/kodak/dc240/dc240.c b/camlibs/kodak/dc240/dc240.c index 2a67d1dea..839fd4c3e 100644 --- a/camlibs/kodak/dc240/dc240.c +++ b/camlibs/kodak/dc240/dc240.c @@ -10,8 +10,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c index 6c08e5a91..0ee3605c2 100644 --- a/camlibs/kodak/dc240/library.c +++ b/camlibs/kodak/dc240/library.c @@ -10,9 +10,9 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-endian.h> #include "dc240.h" #include "library.h" diff --git a/camlibs/kodak/dc240/library.h b/camlibs/kodak/dc240/library.h index 9992df045..5852ec1f4 100644 --- a/camlibs/kodak/dc240/library.h +++ b/camlibs/kodak/dc240/library.h @@ -9,7 +9,7 @@ #define DC240_ACTION_IMAGE (uint8_t)0x9A #define DC240_ACTION_DELETE (uint8_t)0x9D -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2-endian.h> const char *dc240_convert_type_to_camera (uint16_t type); diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index b4a236798..9d8b6e9a7 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -17,7 +17,7 @@ #include <string.h> #include <time.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "library.h" diff --git a/camlibs/kodak/dc3200/dc3200.h b/camlibs/kodak/dc3200/dc3200.h index 43a62f41f..c63289e18 100644 --- a/camlibs/kodak/dc3200/dc3200.h +++ b/camlibs/kodak/dc3200/dc3200.h @@ -12,7 +12,7 @@ #ifndef __DC3200_H__ #define __DC3200_H__ -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define CMD_LIST_FILES 0 #define CMD_GET_PREVIEW 1 diff --git a/camlibs/kodak/dc3200/library.h b/camlibs/kodak/dc3200/library.h index ade40a7a0..8ef21acde 100644 --- a/camlibs/kodak/dc3200/library.h +++ b/camlibs/kodak/dc3200/library.h @@ -12,7 +12,7 @@ #ifndef __LIBRARY_H__ #define __LIBRARY_H__ -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> /* retries */ #define READ_RETRIES 2 diff --git a/camlibs/kodak/ez200/ez200.c b/camlibs/kodak/ez200/ez200.c index e0c87bc3a..3529316d8 100644 --- a/camlibs/kodak/ez200/ez200.c +++ b/camlibs/kodak/ez200/ez200.c @@ -25,8 +25,8 @@ #include <fcntl.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "ez200.h" diff --git a/camlibs/kodak/ez200/ez200.h b/camlibs/kodak/ez200/ez200.h index 2e2b76a39..7eeb72a58 100644 --- a/camlibs/kodak/ez200/ez200.h +++ b/camlibs/kodak/ez200/ez200.h @@ -21,7 +21,7 @@ #ifndef __EZ200_H__ #define __EZ200_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define PING 0x05 #define STATUS 0x06 diff --git a/camlibs/kodak/ez200/library.c b/camlibs/kodak/ez200/library.c index 514fc79f3..ba805de7a 100644 --- a/camlibs/kodak/ez200/library.c +++ b/camlibs/kodak/ez200/library.c @@ -27,7 +27,7 @@ #include <bayer.h> #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -44,7 +44,7 @@ #endif #include "ez200.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "kodak_ez200" diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c index 77fc1acbc..5f1c28473 100644 --- a/camlibs/konica/konica.c +++ b/camlibs/konica/konica.c @@ -25,8 +25,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port-log.h> #include "lowlevel.h" diff --git a/camlibs/konica/konica.h b/camlibs/konica/konica.h index 1f43f5191..5f5b5b04d 100644 --- a/camlibs/konica/konica.h +++ b/camlibs/konica/konica.h @@ -21,8 +21,8 @@ #ifndef __KONICA_H__ #define __KONICA_H__ -#include <gphoto2-port.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-context.h> /* * The following are the commands that are supported by the diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c index ee36a21ea..0afd568db 100644 --- a/camlibs/konica/library.c +++ b/camlibs/konica/library.c @@ -25,8 +25,8 @@ #include <string.h> #include <time.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "konica.h" diff --git a/camlibs/konica/lowlevel.c b/camlibs/konica/lowlevel.c index 89d64aa18..4d87a653a 100644 --- a/camlibs/konica/lowlevel.c +++ b/camlibs/konica/lowlevel.c @@ -25,8 +25,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #include "konica.h" diff --git a/camlibs/konica/lowlevel.h b/camlibs/konica/lowlevel.h index 9ae18c704..349b93e4e 100644 --- a/camlibs/konica/lowlevel.h +++ b/camlibs/konica/lowlevel.h @@ -21,8 +21,8 @@ #ifndef __KONICA_LOWLEVEL_H__ #define __KONICA_LOWLEVEL_H__ -#include <gphoto2-port.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-context.h> int l_ping (GPPort *, GPContext *); int l_init (GPPort *, GPContext *); diff --git a/camlibs/konica/qm150.c b/camlibs/konica/qm150.c index b9721ae92..9156b30c9 100644 --- a/camlibs/konica/qm150.c +++ b/camlibs/konica/qm150.c @@ -37,9 +37,9 @@ #include <string.h> #include <stdio.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #include <exif.h> #ifdef ENABLE_NLS diff --git a/camlibs/largan/lmini/largan.c b/camlibs/largan/lmini/largan.c index 8c04e166e..4a8caa13b 100644 --- a/camlibs/largan/lmini/largan.c +++ b/camlibs/largan/lmini/largan.c @@ -30,8 +30,8 @@ #include <stdio.h> #include <stdlib.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "lmini.h" diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c index c8f75b123..6b929b5e9 100644 --- a/camlibs/largan/lmini/lmini.c +++ b/camlibs/largan/lmini/lmini.c @@ -26,9 +26,9 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-endian.h> #include "lmini.h" #include "lmini_ccd.h" diff --git a/camlibs/largan/lmini/lmini.h b/camlibs/largan/lmini/lmini.h index 3306d3eba..b73cce35c 100644 --- a/camlibs/largan/lmini/lmini.h +++ b/camlibs/largan/lmini/lmini.h @@ -23,8 +23,8 @@ #ifndef _LARGAN_LIBRARY_H_ #define _LARGAN_LIBRARY_H_ -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> typedef enum { diff --git a/camlibs/lg_gsm/lg_gsm.c b/camlibs/lg_gsm/lg_gsm.c index 4d1de133a..5a7b28b5d 100644 --- a/camlibs/lg_gsm/lg_gsm.c +++ b/camlibs/lg_gsm/lg_gsm.c @@ -25,8 +25,8 @@ #include <fcntl.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "lg_gsm.h" diff --git a/camlibs/lg_gsm/lg_gsm.h b/camlibs/lg_gsm/lg_gsm.h index 108d7dc9c..aeecbc0db 100644 --- a/camlibs/lg_gsm/lg_gsm.h +++ b/camlibs/lg_gsm/lg_gsm.h @@ -21,7 +21,7 @@ #ifndef __LG_GSM_H__ #define __LG_GSM_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> typedef unsigned char Info; diff --git a/camlibs/lg_gsm/library.c b/camlibs/lg_gsm/library.c index ae1a12bba..d4f1965dc 100644 --- a/camlibs/lg_gsm/library.c +++ b/camlibs/lg_gsm/library.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -41,7 +41,7 @@ #endif #include "lg_gsm.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "lg_gsm" diff --git a/camlibs/mars/library.c b/camlibs/mars/library.c index cfb331810..0b0b3f263 100644 --- a/camlibs/mars/library.c +++ b/camlibs/mars/library.c @@ -27,7 +27,7 @@ #include <bayer.h> #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -44,7 +44,7 @@ #endif #include "mars.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "mars" diff --git a/camlibs/mars/mars.c b/camlibs/mars/mars.c index efc63fa69..229834a68 100644 --- a/camlibs/mars/mars.c +++ b/camlibs/mars/mars.c @@ -26,9 +26,9 @@ #include <string.h> #include <math.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-endian.h> #include "mars.h" diff --git a/camlibs/mars/mars.h b/camlibs/mars/mars.h index c99ee5a3e..e8594465c 100644 --- a/camlibs/mars/mars.h +++ b/camlibs/mars/mars.h @@ -22,7 +22,7 @@ #define __mars_H__ #include <unistd.h> -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> typedef unsigned char Info; diff --git a/camlibs/minolta/dimagev/dimagev.h b/camlibs/minolta/dimagev/dimagev.h index 8befef4d2..1a9c46f4c 100644 --- a/camlibs/minolta/dimagev/dimagev.h +++ b/camlibs/minolta/dimagev/dimagev.h @@ -42,8 +42,8 @@ #endif /* These better be around. */ -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include <exif.h> diff --git a/camlibs/mustek/core.c b/camlibs/mustek/core.c index c19f10f58..de996a5bc 100644 --- a/camlibs/mustek/core.c +++ b/camlibs/mustek/core.c @@ -24,8 +24,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "core.h" #include "print.h" diff --git a/camlibs/mustek/io.c b/camlibs/mustek/io.c index 864620d69..2be7ee756 100644 --- a/camlibs/mustek/io.c +++ b/camlibs/mustek/io.c @@ -28,8 +28,8 @@ * Sending commands and receiving data */ -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "io.h" diff --git a/camlibs/mustek/mdc800.c b/camlibs/mustek/mdc800.c index a51cfb09f..efa838c7d 100644 --- a/camlibs/mustek/mdc800.c +++ b/camlibs/mustek/mdc800.c @@ -20,8 +20,8 @@ */ #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "print.h" #include "core.h" diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c index d7f50803f..98f2f9c51 100644 --- a/camlibs/mustek/rs232.c +++ b/camlibs/mustek/rs232.c @@ -21,8 +21,8 @@ * supports rs232 and USB. */ -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "print.h" #include "rs232.h" diff --git a/camlibs/mustek/usb.c b/camlibs/mustek/usb.c index 415134f5e..44fb2d657 100644 --- a/camlibs/mustek/usb.c +++ b/camlibs/mustek/usb.c @@ -26,8 +26,8 @@ */ #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include "print.h" #include "usb.h" diff --git a/camlibs/panasonic/coolshot/coolshot.c b/camlibs/panasonic/coolshot/coolshot.c index 60470916f..651589364 100644 --- a/camlibs/panasonic/coolshot/coolshot.c +++ b/camlibs/panasonic/coolshot/coolshot.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/panasonic/coolshot/library.c b/camlibs/panasonic/coolshot/library.c index c58b15b2f..d704bd8b5 100644 --- a/camlibs/panasonic/coolshot/library.c +++ b/camlibs/panasonic/coolshot/library.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include <time.h> #include "library.h" #include <unistd.h> diff --git a/camlibs/panasonic/dc.h b/camlibs/panasonic/dc.h index bb2404349..ca429153d 100644 --- a/camlibs/panasonic/dc.h +++ b/camlibs/panasonic/dc.h @@ -23,7 +23,7 @@ #include <stdio.h> #include <errno.h> #include <_stdint.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #define DSC1 1 /* DC1000 */ #define DSC2 2 /* DC1580 */ diff --git a/camlibs/panasonic/l859/l859.c b/camlibs/panasonic/l859/l859.c index 082d61d43..796f559c8 100644 --- a/camlibs/panasonic/l859/l859.c +++ b/camlibs/panasonic/l859/l859.c @@ -36,9 +36,9 @@ # define N_(String) (String) #endif -#include <gphoto2-endian.h> -#include <gphoto2-port-log.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-endian.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> #ifndef __FILE__ # define __FILE__ "l859.c" diff --git a/camlibs/panasonic/l859/l859.h b/camlibs/panasonic/l859/l859.h index 14c18e5f8..217ce9caa 100644 --- a/camlibs/panasonic/l859/l859.h +++ b/camlibs/panasonic/l859/l859.h @@ -21,7 +21,7 @@ #ifndef __L859_H__ #define __L859_H__ -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define L859_BLOCKSIZE 0x74 #define L859_BUFSIZE 0x74 diff --git a/camlibs/pccam300/library.c b/camlibs/pccam300/library.c index c51769fd1..5aca3b607 100644 --- a/camlibs/pccam300/library.c +++ b/camlibs/pccam300/library.c @@ -33,8 +33,8 @@ #include <fcntl.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "pccam300" diff --git a/camlibs/pccam300/pccam300.c b/camlibs/pccam300/pccam300.c index cca01262a..b999cebd1 100644 --- a/camlibs/pccam300/pccam300.c +++ b/camlibs/pccam300/pccam300.c @@ -31,9 +31,9 @@ #include "pccam300.h" -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> #define GP_MODULE "pccam300" diff --git a/camlibs/pccam300/pccam300.h b/camlibs/pccam300/pccam300.h index 1a6bb5333..2b0b56563 100644 --- a/camlibs/pccam300/pccam300.h +++ b/camlibs/pccam300/pccam300.h @@ -27,8 +27,8 @@ #ifndef __PCCAM300_H__ #define __PCCAM300_H__ -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #define CHECK(result) {int res; res = result; if (res < 0) return (res);} diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index b9049c065..e44a72d8a 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -36,8 +36,8 @@ #include <fcntl.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "pccam600" diff --git a/camlibs/pccam600/pccam600.c b/camlibs/pccam600/pccam600.c index 419bbea6a..2e5d69e81 100644 --- a/camlibs/pccam600/pccam600.c +++ b/camlibs/pccam600/pccam600.c @@ -32,9 +32,9 @@ #include "pccam600.h" -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> #define GP_MODULE "pccam600" diff --git a/camlibs/pccam600/pccam600.h b/camlibs/pccam600/pccam600.h index ebc702971..8e66fb2ce 100644 --- a/camlibs/pccam600/pccam600.h +++ b/camlibs/pccam600/pccam600.h @@ -16,8 +16,8 @@ #ifndef __PCCAM600_H__ #define __PCCAM600_H__ -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> typedef struct { unsigned char state; /*delete or ok*/ diff --git a/camlibs/polaroid/dlink350f.c b/camlibs/polaroid/dlink350f.c index c9964534c..570b3e0e1 100644 --- a/camlibs/polaroid/dlink350f.c +++ b/camlibs/polaroid/dlink350f.c @@ -26,8 +26,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #define GP_MODULE "dlink350f" diff --git a/camlibs/polaroid/jd350e.c b/camlibs/polaroid/jd350e.c index 3af61eed7..d5d165e48 100644 --- a/camlibs/polaroid/jd350e.c +++ b/camlibs/polaroid/jd350e.c @@ -25,8 +25,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "jd350e.h" #include "jd350e_red.h" diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index 7c5571578..f628845cc 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -35,8 +35,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "pdc320.h" diff --git a/camlibs/polaroid/pdc640.c b/camlibs/polaroid/pdc640.c index 6c83ba99f..a01b3d6f5 100644 --- a/camlibs/polaroid/pdc640.c +++ b/camlibs/polaroid/pdc640.c @@ -24,8 +24,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include <bayer.h> #include "jd350e.h" diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index c370215d5..28bea9d23 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -25,8 +25,8 @@ #include <stdio.h> #include <time.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 19b7a5e9f..021d9510b 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -24,9 +24,9 @@ #include <stdio.h> #include <time.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> -#include <gphoto2-setting.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-setting.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 1a844389f..f1b5308bd 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -27,9 +27,9 @@ #include <time.h> #include <langinfo.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> -#include <gphoto2-setting.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-setting.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index c7fed0cb1..30381c7df 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -24,7 +24,7 @@ #include <stdarg.h> #include <time.h> #include <iconv.h> -#include "gphoto2-endian.h" +#include <gphoto2/gphoto2-endian.h> /* PTP datalayer byteorder */ diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c index b99a42691..6d78313b6 100644 --- a/camlibs/ptp2/ptpip.c +++ b/camlibs/ptp2/ptpip.c @@ -39,9 +39,9 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> -#include <gphoto2-setting.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-setting.h> #ifdef ENABLE_NLS diff --git a/camlibs/ricoh/g3.c b/camlibs/ricoh/g3.c index 0430096da..0997b0273 100644 --- a/camlibs/ricoh/g3.c +++ b/camlibs/ricoh/g3.c @@ -25,9 +25,9 @@ #include <string.h> #include <unistd.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/ricoh/library.c b/camlibs/ricoh/library.c index 920575e20..d43eda146 100644 --- a/camlibs/ricoh/library.c +++ b/camlibs/ricoh/library.c @@ -24,8 +24,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "ricoh.h" diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c index 18955482e..70dc67c80 100644 --- a/camlibs/ricoh/ricoh.c +++ b/camlibs/ricoh/ricoh.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> #include "crctab.h" diff --git a/camlibs/ricoh/ricoh.h b/camlibs/ricoh/ricoh.h index 8342c27a8..1d808a394 100644 --- a/camlibs/ricoh/ricoh.h +++ b/camlibs/ricoh/ricoh.h @@ -23,8 +23,8 @@ #include <time.h> -#include <gphoto2-camera.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-context.h> typedef enum _RicohSpeed RicohSpeed; enum _RicohSpeed { diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index d3845f0f0..7d1c1fd84 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> /* The commands */ #define SDSC_START 0x43 diff --git a/camlibs/sierra/epson-desc.c b/camlibs/sierra/epson-desc.c index 6e185f39a..ac4adcaab 100644 --- a/camlibs/sierra/epson-desc.c +++ b/camlibs/sierra/epson-desc.c @@ -26,7 +26,7 @@ #include <sys/types.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "sierra.h" #include "library.h" #include "sierra-desc.h" diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index d993169d0..a4f0604c2 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -26,7 +26,7 @@ #include <string.h> #include <time.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> #include "sierra.h" #include "sierra-usbwrap.h" diff --git a/camlibs/sierra/library.h b/camlibs/sierra/library.h index 93b707e10..015fe92e4 100644 --- a/camlibs/sierra/library.h +++ b/camlibs/sierra/library.h @@ -21,7 +21,7 @@ #ifndef __LIBRARY_H__ #define __LIBRARY_H__ -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define TIMEOUT 2000 diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c index cb9e5a00f..349607538 100644 --- a/camlibs/sierra/nikon-desc.c +++ b/camlibs/sierra/nikon-desc.c @@ -22,7 +22,7 @@ #include <sys/types.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "sierra.h" #include "library.h" #include "sierra-desc.h" diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c index a2d4fd518..df6fb1ebf 100644 --- a/camlibs/sierra/olympus-desc.c +++ b/camlibs/sierra/olympus-desc.c @@ -27,7 +27,7 @@ #include <sys/types.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> #include "sierra.h" #include "library.h" #include "sierra-desc.h" diff --git a/camlibs/sierra/sierra-desc.c b/camlibs/sierra/sierra-desc.c index bf88ef96a..451150796 100644 --- a/camlibs/sierra/sierra-desc.c +++ b/camlibs/sierra/sierra-desc.c @@ -26,8 +26,8 @@ #include <math.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "sierra.h" #include "sierra-desc.h" diff --git a/camlibs/sierra/sierra-usbwrap.c b/camlibs/sierra/sierra-usbwrap.c index 6d83d3773..0e3a79ab0 100644 --- a/camlibs/sierra/sierra-usbwrap.c +++ b/camlibs/sierra/sierra-usbwrap.c @@ -44,8 +44,8 @@ #include <_stdint.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #define GP_MODULE "sierra" diff --git a/camlibs/sierra/sierra-usbwrap.h b/camlibs/sierra/sierra-usbwrap.h index 4d9c06226..85a1a40ba 100644 --- a/camlibs/sierra/sierra-usbwrap.h +++ b/camlibs/sierra/sierra-usbwrap.h @@ -21,7 +21,7 @@ #ifndef __SIERRA_USBWRAP_H__ #define __SIERRA_USBWRAP_H__ -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> int usb_wrap_write_packet (GPPort *dev, unsigned int type, char *sierra_msg, int sierra_len); int usb_wrap_read_packet (GPPort *dev, unsigned int type, char *sierra_response, int sierra_len); diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index 96ea309aa..5e0816f2b 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -26,8 +26,8 @@ #include <string.h> #include <time.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "sierra-desc.h" #include "library.h" diff --git a/camlibs/sipix/blink.c b/camlibs/sipix/blink.c index d2a6ce74b..971420f25 100644 --- a/camlibs/sipix/blink.c +++ b/camlibs/sipix/blink.c @@ -27,8 +27,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c index 523149dc7..699a3e68a 100644 --- a/camlibs/sipix/blink2.c +++ b/camlibs/sipix/blink2.c @@ -27,9 +27,9 @@ # include <jpeglib.h> #endif -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/sipix/web2.c b/camlibs/sipix/web2.c index ab40ecda6..7dabbc212 100644 --- a/camlibs/sipix/web2.c +++ b/camlibs/sipix/web2.c @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/smal/smal.c b/camlibs/smal/smal.c index 1b0db3906..ef26bc534 100644 --- a/camlibs/smal/smal.c +++ b/camlibs/smal/smal.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include <bayer.h> #include <gamma.h> diff --git a/camlibs/smal/ultrapocket.c b/camlibs/smal/ultrapocket.c index 14070bdcf..872943f92 100644 --- a/camlibs/smal/ultrapocket.c +++ b/camlibs/smal/ultrapocket.c @@ -22,9 +22,9 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-port-log.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #include <bayer.h> #include <gamma.h> diff --git a/camlibs/smal/ultrapocket.h b/camlibs/smal/ultrapocket.h index d50c56e85..139d56e8c 100644 --- a/camlibs/smal/ultrapocket.h +++ b/camlibs/smal/ultrapocket.h @@ -21,8 +21,8 @@ #define __ULTRAPOCKET_H__ 1 -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #ifndef CHECK_RESULT #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} diff --git a/camlibs/sonix/library.c b/camlibs/sonix/library.c index 986c5afcc..a5e4e2901 100644 --- a/camlibs/sonix/library.c +++ b/camlibs/sonix/library.c @@ -27,7 +27,7 @@ #include <bayer.h> #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS @@ -45,7 +45,7 @@ # define ngettext(String1,String2,Count) ((Count==1)?String1:String2) #endif -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #include "sonix.h" #include "sakar-avi-header.h" #define GP_MODULE "sonix" diff --git a/camlibs/sonix/sonix.c b/camlibs/sonix/sonix.c index 10def9393..f8472ccfb 100644 --- a/camlibs/sonix/sonix.c +++ b/camlibs/sonix/sonix.c @@ -26,8 +26,8 @@ #include <string.h> #include <math.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "sonix.h" #define GP_MODULE "sonix" diff --git a/camlibs/sonix/sonix.h b/camlibs/sonix/sonix.h index a79220075..db8c19263 100644 --- a/camlibs/sonix/sonix.h +++ b/camlibs/sonix/sonix.h @@ -21,7 +21,7 @@ #ifndef __SONIX_H__ #define __SONIX_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> /* *typedef enum {MODEL_VIVICAM diff --git a/camlibs/sonydscf1/chotplay.c b/camlibs/sonydscf1/chotplay.c index 04b17ee60..e3a125e40 100644 --- a/camlibs/sonydscf1/chotplay.c +++ b/camlibs/sonydscf1/chotplay.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <string.h> #include <errno.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #define BINARYFILEMODE diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c index 761bafe08..4da624729 100644 --- a/camlibs/sonydscf1/command.c +++ b/camlibs/sonydscf1/command.c @@ -8,7 +8,7 @@ #include <unistd.h> #endif -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "command.h" #include "common.h" diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index bc9b81bbb..7d9e64c2d 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -4,7 +4,7 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/sonydscf55/camera.c b/camlibs/sonydscf55/camera.c index 6b9aec683..e8a936e02 100644 --- a/camlibs/sonydscf55/camera.c +++ b/camlibs/sonydscf55/camera.c @@ -22,12 +22,12 @@ #include <string.h> #include <stdlib.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include <sys/types.h> #include "sony.h" #include "nls.h" -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define GP_MODULE "sonydscf55" diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c index 569ea9716..42ef88b50 100644 --- a/camlibs/sonydscf55/sony.c +++ b/camlibs/sonydscf55/sony.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include "sony.h" #define GP_MODULE "sony55" diff --git a/camlibs/soundvision/agfa_cl18.c b/camlibs/soundvision/agfa_cl18.c index eb3d70863..35e7b38b4 100644 --- a/camlibs/soundvision/agfa_cl18.c +++ b/camlibs/soundvision/agfa_cl18.c @@ -16,8 +16,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "soundvision.h" #include "commands.h" diff --git a/camlibs/soundvision/commands.c b/camlibs/soundvision/commands.c index 1f7300748..43cddc5ec 100644 --- a/camlibs/soundvision/commands.c +++ b/camlibs/soundvision/commands.c @@ -17,8 +17,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "soundvision.h" #include "commands.h" diff --git a/camlibs/soundvision/soundvision.c b/camlibs/soundvision/soundvision.c index 8bdf68355..11d9be20c 100644 --- a/camlibs/soundvision/soundvision.c +++ b/camlibs/soundvision/soundvision.c @@ -23,7 +23,7 @@ #endif #include <netinet/in.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -41,7 +41,7 @@ #include "soundvision.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "soundvision" diff --git a/camlibs/soundvision/tiger_fastflicks.c b/camlibs/soundvision/tiger_fastflicks.c index a18a63ca1..43b50ccfe 100644 --- a/camlibs/soundvision/tiger_fastflicks.c +++ b/camlibs/soundvision/tiger_fastflicks.c @@ -30,8 +30,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "soundvision.h" #include "commands.h" diff --git a/camlibs/spca50x/library.c b/camlibs/spca50x/library.c index dac1fff7b..c79235d55 100644 --- a/camlibs/spca50x/library.c +++ b/camlibs/spca50x/library.c @@ -30,8 +30,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/spca50x/spca50x-flash.c b/camlibs/spca50x/spca50x-flash.c index b84666a86..211aceb95 100644 --- a/camlibs/spca50x/spca50x-flash.c +++ b/camlibs/spca50x/spca50x-flash.c @@ -31,10 +31,10 @@ #include <stdio.h> #include <stdlib.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-endian.h> #define GP_MODULE "spca50x" #include "spca50x.h" diff --git a/camlibs/spca50x/spca50x-flash.h b/camlibs/spca50x/spca50x-flash.h index 772b30a3c..255991a5d 100644 --- a/camlibs/spca50x/spca50x-flash.h +++ b/camlibs/spca50x/spca50x-flash.h @@ -17,8 +17,8 @@ #ifndef __SPCA50X_FLASH_H__ #define __SPCA50X_FLASH_H_ -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #define CHECK(result) {int res; res = result; if (res < 0) return (res);} diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c index 67318ebbd..7c42cda07 100644 --- a/camlibs/spca50x/spca50x-sdram.c +++ b/camlibs/spca50x/spca50x-sdram.c @@ -28,8 +28,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "spca50x.h" #include "spca50x-sdram.h" diff --git a/camlibs/spca50x/spca50x-sdram.h b/camlibs/spca50x/spca50x-sdram.h index 1c7a256c2..53c4a627e 100644 --- a/camlibs/spca50x/spca50x-sdram.h +++ b/camlibs/spca50x/spca50x-sdram.h @@ -26,7 +26,7 @@ #ifndef __SPCA50X_SDRAM_H__ #define __SPCA50X_SDRAM_H__ -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> int spca50x_sdram_get_info (CameraPrivateLibrary * lib); int spca50x_sdram_delete_file (CameraPrivateLibrary * lib, unsigned int index); diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c index 7f3d16f45..969d5ed0d 100644 --- a/camlibs/spca50x/spca50x.c +++ b/camlibs/spca50x/spca50x.c @@ -30,8 +30,8 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #include "spca50x.h" #include "spca50x-registers.h" diff --git a/camlibs/spca50x/spca50x.h b/camlibs/spca50x/spca50x.h index de26c5523..ddece2c2f 100644 --- a/camlibs/spca50x/spca50x.h +++ b/camlibs/spca50x/spca50x.h @@ -27,7 +27,7 @@ #ifndef __SPCA50X_H__ #define __SPCA50X_H__ #include <_stdint.h> -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define SPCA50X_FAT_PAGE_SIZE 0x100 #define SPCA50X_FILE_TYPE_IMAGE 0x00 diff --git a/camlibs/sq905/library.c b/camlibs/sq905/library.c index 0e559d766..7aab596f0 100644 --- a/camlibs/sq905/library.c +++ b/camlibs/sq905/library.c @@ -28,7 +28,7 @@ #include <gamma.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -46,7 +46,7 @@ #include "sq905.h" -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #define GP_MODULE "sq905" diff --git a/camlibs/sq905/postprocess.c b/camlibs/sq905/postprocess.c index 61faf1ac5..039455800 100644 --- a/camlibs/sq905/postprocess.c +++ b/camlibs/sq905/postprocess.c @@ -27,8 +27,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "sq905.h" #define GP_MODULE "sq905" diff --git a/camlibs/sq905/sq905.c b/camlibs/sq905/sq905.c index 85eee38f8..4c2698cd9 100644 --- a/camlibs/sq905/sq905.c +++ b/camlibs/sq905/sq905.c @@ -26,8 +26,8 @@ #include <db.h> #endif -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "sq905.h" #define GP_MODULE "sq905" diff --git a/camlibs/sq905/sq905.h b/camlibs/sq905/sq905.h index f45fd439f..1b678b4d6 100644 --- a/camlibs/sq905/sq905.h +++ b/camlibs/sq905/sq905.h @@ -1,7 +1,7 @@ #ifndef __SQ905_H__ #define __SQ905_H__ -#include <libgphoto2_port/gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> /* A 'picture' is a single standalone picture. * A 'clip' is an autoshoot clip. diff --git a/camlibs/stv0674/library.c b/camlibs/stv0674/library.c index d0c1105f7..03bcd578a 100644 --- a/camlibs/stv0674/library.c +++ b/camlibs/stv0674/library.c @@ -24,8 +24,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "stv0674.h" #include "library.h" diff --git a/camlibs/stv0674/library.h b/camlibs/stv0674/library.h index 38ed683ba..15881b9b8 100644 --- a/camlibs/stv0674/library.h +++ b/camlibs/stv0674/library.h @@ -21,7 +21,7 @@ #ifndef LIBRARY_H #define LIBRARY_H -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> int stv0674_ping (GPPort *); int stv0674_summary (GPPort *, char*); diff --git a/camlibs/stv0674/stv0674.c b/camlibs/stv0674/stv0674.c index 74e77186c..898582f9e 100644 --- a/camlibs/stv0674/stv0674.c +++ b/camlibs/stv0674/stv0674.c @@ -23,9 +23,9 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-library.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c index e92921919..451e026aa 100644 --- a/camlibs/stv0680/library.c +++ b/camlibs/stv0680/library.c @@ -23,8 +23,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> #include "stv0680.h" #include "library.h" diff --git a/camlibs/stv0680/library.h b/camlibs/stv0680/library.h index 99c679477..45b8bb51c 100644 --- a/camlibs/stv0680/library.h +++ b/camlibs/stv0680/library.h @@ -20,7 +20,7 @@ #ifndef LIBRARY_H #define LIBRARY_H -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> int stv0680_ping (GPPort *); int stv0680_summary (GPPort *, char*); diff --git a/camlibs/stv0680/stv0680.c b/camlibs/stv0680/stv0680.c index 8c2c33d5e..9d431cbef 100644 --- a/camlibs/stv0680/stv0680.c +++ b/camlibs/stv0680/stv0680.c @@ -22,9 +22,9 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <gphoto2.h> -#include <gphoto2-port.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-library.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/sx330z/library.c b/camlibs/sx330z/library.c index eda3834fe..7ce00eede 100644 --- a/camlibs/sx330z/library.c +++ b/camlibs/sx330z/library.c @@ -22,8 +22,8 @@ #include <stdio.h> #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #include "sx330z.h" diff --git a/camlibs/sx330z/sx330z.c b/camlibs/sx330z/sx330z.c index a9fc9cee6..b38bd2e90 100644 --- a/camlibs/sx330z/sx330z.c +++ b/camlibs/sx330z/sx330z.c @@ -29,7 +29,7 @@ /* strncmp */ #include <string.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2-endian.h> /*convert to correct endianness */ int diff --git a/camlibs/sx330z/sx330z.h b/camlibs/sx330z/sx330z.h index 5ca89c351..438d2c939 100644 --- a/camlibs/sx330z/sx330z.h +++ b/camlibs/sx330z/sx330z.h @@ -23,8 +23,8 @@ */ -#include <gphoto2-camera.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-context.h> /* USB spec violating ! */ diff --git a/camlibs/template/template.c b/camlibs/template/template.c index 0d86fa2ef..8cdf97913 100644 --- a/camlibs/template/template.c +++ b/camlibs/template/template.c @@ -53,8 +53,8 @@ #include <string.h> -#include <gphoto2-library.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/camlibs/toshiba/pdrm11/library.c b/camlibs/toshiba/pdrm11/library.c index 7fb973fcf..9f7d9fbf3 100644 --- a/camlibs/toshiba/pdrm11/library.c +++ b/camlibs/toshiba/pdrm11/library.c @@ -24,7 +24,7 @@ #include <_stdint.h> #include <string.h> -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #ifdef ENABLE_NLS diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c index ef1eb520f..4d6d2407e 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.c +++ b/camlibs/toshiba/pdrm11/pdrm11.c @@ -25,8 +25,8 @@ #include <stdlib.h> #include <unistd.h> -#include <gphoto2.h> -#include <gphoto2-endian.h> +#include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-endian.h> #define GP_MODULE "pdrm11" #define ETIMEDOUT 110 diff --git a/camlibs/toshiba/pdrm11/pdrm11.h b/camlibs/toshiba/pdrm11/pdrm11.h index bd9ba9530..86028e5c0 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.h +++ b/camlibs/toshiba/pdrm11/pdrm11.h @@ -22,7 +22,7 @@ #define __PDRM11_H__ #include "config.h" -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> #include <_stdint.h> /* once in a while a gp_port command will fail and then work on a diff --git a/configure.in b/configure.in index 57db8a1bc..be65a78bf 100644 --- a/configure.in +++ b/configure.in @@ -520,6 +520,14 @@ fi # --------------------------------------------------------------------------- +# Remove obsolete directory of copied files/symlinks +# --------------------------------------------------------------------------- + +rm -f gphoto2/gphoto2*.h +rmdir gphoto2 || true + + +# --------------------------------------------------------------------------- # Create output files # --------------------------------------------------------------------------- AC_CONFIG_FILES([ diff --git a/doc/libgphoto2.3 b/doc/libgphoto2.3 index ccb4ec581..ffa08b9bd 100644 --- a/doc/libgphoto2.3 +++ b/doc/libgphoto2.3 @@ -12,7 +12,7 @@ libgphoto2 \- cross\-platform digital camera library .SH "SYNOPSIS" .sp .nf -#include <gphoto2.h> +#include <gphoto2/gphoto2.h> .fi .SH "DESCRIPTION" .PP diff --git a/doc/libgphoto2_port.3 b/doc/libgphoto2_port.3 index 9c4758f4c..2e96a06a8 100644 --- a/doc/libgphoto2_port.3 +++ b/doc/libgphoto2_port.3 @@ -12,7 +12,7 @@ libgphoto2_port \- cross\-platform port access library .SH "SYNOPSIS" .sp .nf -#include <gphoto2_port.h> +#include <gphoto2/gphoto2_port.h> .fi .SH "DESCRIPTION" .PP diff --git a/gphoto2-config.in b/gphoto2-config.in index d77cb3db1..b2f254d7e 100644 --- a/gphoto2-config.in +++ b/gphoto2-config.in @@ -55,7 +55,7 @@ while test $# -gt 0; do ;; --cflags) - echo "-I@includedir@/gphoto2" "-I@includedir@" + echo "-I@includedir@/gphoto2" ;; --libs) diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index 23ad09ad8..d36bdc475 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -34,7 +34,6 @@ libgphoto2_la_SOURCES = \ gphoto2-list.c \ gphoto2-result.c \ gphoto2-version.c \ - gphoto2-version.h \ gphoto2-setting.c \ gphoto2-widget.c @@ -49,23 +48,23 @@ libgphoto2_la_LIBADD = \ # "-dlopen" $(top_builddir)/camlibs/ptp2/....la libgphoto2_la_DEPENDENCIES = \ + gphoto2/gphoto2-version.h \ $(srcdir)/libgphoto2.sym \ $(LIBLTDL) -libgphoto2includedir = $(includedir)/gphoto2 -libgphoto2include_HEADERS = \ - gphoto2.h \ - gphoto2-abilities-list.h\ - gphoto2-camera.h \ - gphoto2-context.h \ - gphoto2-file.h \ - gphoto2-filesys.h \ - gphoto2-library.h \ - gphoto2-list.h \ - gphoto2-result.h \ - gphoto2-setting.h \ - gphoto2-version.h \ - gphoto2-widget.h +nobase_include_HEADERS = \ + gphoto2/gphoto2.h \ + gphoto2/gphoto2-abilities-list.h\ + gphoto2/gphoto2-camera.h \ + gphoto2/gphoto2-context.h \ + gphoto2/gphoto2-file.h \ + gphoto2/gphoto2-filesys.h \ + gphoto2/gphoto2-library.h \ + gphoto2/gphoto2-list.h \ + gphoto2/gphoto2-result.h \ + gphoto2/gphoto2-setting.h \ + gphoto2/gphoto2-version.h \ + gphoto2/gphoto2-widget.h pkgconfig_DATA = libgphoto2.pc @@ -83,9 +82,9 @@ DISTCLEANFILES = _stdint.h gphoto2-endian.h # #include <gphoto2/gphoto2-camera.h> install-data-local: - $(INSTALL) -m 0755 -d $(DESTDIR)$(libgphoto2includedir) - rm -f $(DESTDIR)$(libgphoto2includedir)/gphoto2 - $(LN_S) . $(DESTDIR)$(libgphoto2includedir)/gphoto2 + rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2 + $(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2 + $(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2 uninstall-local: - rm -f $(DESTDIR)$(libgphoto2includedir)/gphoto2 + rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2 diff --git a/libgphoto2/bayer.c b/libgphoto2/bayer.c index 8a6b5a8f6..9bd864bc1 100644 --- a/libgphoto2/bayer.c +++ b/libgphoto2/bayer.c @@ -21,7 +21,7 @@ #include "config.h" #include "bayer.h" -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-result.h> static int tile_colors[8][4] = { {0, 1, 1, 2}, diff --git a/libgphoto2/gamma.c b/libgphoto2/gamma.c index a84973637..8f8e65071 100644 --- a/libgphoto2/gamma.c +++ b/libgphoto2/gamma.c @@ -23,7 +23,7 @@ #include <math.h> -#include <gphoto2-result.h> +#include <gphoto2/gphoto2-result.h> static int gp_gamma_correct_triple (unsigned char *table_red, diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c index 7068e6485..9db2eb9b5 100644 --- a/libgphoto2/gphoto2-abilities-list.c +++ b/libgphoto2/gphoto2-abilities-list.c @@ -25,7 +25,7 @@ #define _GPHOTO2_INTERNAL_CODE #include "config.h" -#include "gphoto2-abilities-list.h" +#include <gphoto2/gphoto2-abilities-list.h> #include <stdlib.h> #include <stdio.h> @@ -33,9 +33,9 @@ #include <ltdl.h> -#include "gphoto2-result.h" -#include "gphoto2-port-log.h" -#include "gphoto2-library.h" +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-library.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index bd7916003..35925a096 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -25,7 +25,7 @@ */ #include "config.h" -#include "gphoto2-camera.h" +#include <gphoto2/gphoto2-camera.h> #include <stdlib.h> #include <string.h> @@ -34,10 +34,10 @@ #include <ltdl.h> -#include "gphoto2-context.h" -#include "gphoto2-result.h" -#include "gphoto2-library.h" -#include "gphoto2-port-log.h" +#include <gphoto2/gphoto2-context.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2/gphoto2-context.c b/libgphoto2/gphoto2-context.c index 1efa787cd..9b08836f2 100644 --- a/libgphoto2/gphoto2-context.c +++ b/libgphoto2/gphoto2-context.c @@ -19,12 +19,12 @@ */ #include "config.h" -#include "gphoto2-context.h" +#include <gphoto2/gphoto2-context.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> /** * \internal diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c index 8406082f6..fe6ef245a 100644 --- a/libgphoto2/gphoto2-file.c +++ b/libgphoto2/gphoto2-file.c @@ -26,7 +26,7 @@ */ #include "config.h" -#include "gphoto2-file.h" +#include <gphoto2/gphoto2-file.h> #include <stdlib.h> #include <stdio.h> @@ -35,10 +35,10 @@ #include <sys/stat.h> #include <utime.h> -#include <gphoto2-port-log.h> -#include <gphoto2-port-portability.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-portability.h> -#include "gphoto2-result.h" +#include <gphoto2/gphoto2-result.h> #define CHECK_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);} #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index ae9d1c0e7..4dcdef841 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -22,17 +22,17 @@ */ #include "config.h" -#include "gphoto2-filesys.h" +#include <gphoto2/gphoto2-filesys.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #include <unistd.h> -#include "gphoto2-result.h" -#include "gphoto2-file.h" -#include "gphoto2-port-log.h" -#include "gphoto2-setting.h" +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-file.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-setting.h> #include <limits.h> diff --git a/libgphoto2/gphoto2-library.c b/libgphoto2/gphoto2-library.c index 3bb8c7542..f7c4e191b 100644 --- a/libgphoto2/gphoto2-library.c +++ b/libgphoto2/gphoto2-library.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include "gphoto2-library.c" +#include <gphoto2/gphoto2-library.c> /** * camera_id: diff --git a/libgphoto2/gphoto2-list.c b/libgphoto2/gphoto2-list.c index ffd84d3b1..121e9bb1c 100644 --- a/libgphoto2/gphoto2-list.c +++ b/libgphoto2/gphoto2-list.c @@ -22,14 +22,14 @@ */ #include "config.h" -#include "gphoto2-list.h" -#include "gphoto2-port-log.h" +#include <gphoto2/gphoto2-list.h> +#include <gphoto2/gphoto2-port-log.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "gphoto2-result.h" +#include <gphoto2/gphoto2-result.h> #define CHECK_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);} #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} @@ -146,9 +146,9 @@ gp_list_append (CameraList *list, const char *name, const char *value) if (list->count == MAX_ENTRIES) { gp_log (GP_LOG_ERROR, "gphoto2-list", "gp_list_append: " - "Tried to add more than %d entries to the list, reporting out of memory", + "Tried to add more than %d entries to the list, reporting error.", MAX_ENTRIES); - return (GP_ERROR_NO_MEMORY); + return (GP_ERROR_FIXED_LIMIT_EXCEEDED); } if (name) { diff --git a/libgphoto2/gphoto2-result.c b/libgphoto2/gphoto2-result.c index 812bf4896..d9e69582c 100644 --- a/libgphoto2/gphoto2-result.c +++ b/libgphoto2/gphoto2-result.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include "gphoto2-result.h" +#include <gphoto2/gphoto2-result.h> #include <stddef.h> diff --git a/libgphoto2/gphoto2-setting.c b/libgphoto2/gphoto2-setting.c index b028a3f68..82fdc0007 100644 --- a/libgphoto2/gphoto2-setting.c +++ b/libgphoto2/gphoto2-setting.c @@ -19,16 +19,16 @@ */ #include "config.h" -#include "gphoto2-setting.h" +#include <gphoto2/gphoto2-setting.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "gphoto2-result.h" -#include "gphoto2-port-log.h" -#include "gphoto2-port-portability.h" +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-portability.h> #define GP_MODULE "setting" diff --git a/libgphoto2/gphoto2-version.c b/libgphoto2/gphoto2-version.c index 029fa0243..5b5ddd7ce 100644 --- a/libgphoto2/gphoto2-version.c +++ b/libgphoto2/gphoto2-version.c @@ -22,7 +22,7 @@ #include <stdlib.h> -#include <gphoto2-version.h> +#include <gphoto2/gphoto2-version.h> const char **gp_library_version(GPVersionVerbosity verbose) { diff --git a/libgphoto2/gphoto2-widget.c b/libgphoto2/gphoto2-widget.c index f03474eea..8e8266d5c 100644 --- a/libgphoto2/gphoto2-widget.c +++ b/libgphoto2/gphoto2-widget.c @@ -21,13 +21,13 @@ * Boston, MA 02111-1307, USA. */ #include "config.h" -#include "gphoto2-widget.h" +#include <gphoto2/gphoto2-widget.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #define CHECK_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);} diff --git a/libgphoto2/gphoto2-abilities-list.h b/libgphoto2/gphoto2/gphoto2-abilities-list.h index 601b36cee..8e1d29639 100644 --- a/libgphoto2/gphoto2-abilities-list.h +++ b/libgphoto2/gphoto2/gphoto2-abilities-list.h @@ -25,11 +25,11 @@ #ifndef __GPHOTO2_ABILITIES_LIST_H__ #define __GPHOTO2_ABILITIES_LIST_H__ -#include <gphoto2-context.h> -#include <gphoto2-list.h> -#include <gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-context.h> +#include <gphoto2/gphoto2-list.h> +#include <gphoto2/gphoto2-port-info-list.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef __cplusplus extern "C" { diff --git a/libgphoto2/gphoto2-camera.h b/libgphoto2/gphoto2/gphoto2-camera.h index c1c45845f..733f843d7 100644 --- a/libgphoto2/gphoto2-camera.h +++ b/libgphoto2/gphoto2/gphoto2-camera.h @@ -26,7 +26,7 @@ #ifndef __GPHOTO2_CAMERA_H__ #define __GPHOTO2_CAMERA_H__ -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-context.h> /** @@ -43,16 +43,16 @@ typedef struct _Camera Camera; -#include <gphoto2-port.h> -#include <gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-info-list.h> -#include <gphoto2-widget.h> -#include <gphoto2-list.h> -#include <gphoto2-file.h> -#include <gphoto2-filesys.h> -#include <gphoto2-abilities-list.h> -#include <gphoto2-result.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-widget.h> +#include <gphoto2/gphoto2-list.h> +#include <gphoto2/gphoto2-file.h> +#include <gphoto2/gphoto2-filesys.h> +#include <gphoto2/gphoto2-abilities-list.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-context.h> typedef struct { char text [32 * 1024]; diff --git a/libgphoto2/gphoto2-context.h b/libgphoto2/gphoto2/gphoto2-context.h index 07f7c7acd..07f7c7acd 100644 --- a/libgphoto2/gphoto2-context.h +++ b/libgphoto2/gphoto2/gphoto2-context.h diff --git a/libgphoto2/gphoto2-file.h b/libgphoto2/gphoto2/gphoto2-file.h index 0416a9540..0416a9540 100644 --- a/libgphoto2/gphoto2-file.h +++ b/libgphoto2/gphoto2/gphoto2-file.h diff --git a/libgphoto2/gphoto2-filesys.h b/libgphoto2/gphoto2/gphoto2-filesys.h index ac1c60bc7..e9ba68fbd 100644 --- a/libgphoto2/gphoto2-filesys.h +++ b/libgphoto2/gphoto2/gphoto2-filesys.h @@ -30,9 +30,9 @@ #include <time.h> -#include <gphoto2-context.h> -#include <gphoto2-list.h> -#include <gphoto2-file.h> +#include <gphoto2/gphoto2-context.h> +#include <gphoto2/gphoto2-list.h> +#include <gphoto2/gphoto2-file.h> #ifdef __cplusplus extern "C" { diff --git a/libgphoto2/gphoto2-library.h b/libgphoto2/gphoto2/gphoto2-library.h index d033bf8bb..e172cbb93 100644 --- a/libgphoto2/gphoto2-library.h +++ b/libgphoto2/gphoto2/gphoto2-library.h @@ -24,9 +24,9 @@ #ifndef __GPHOTO2_LIBRARY_H__ #define __GPHOTO2_LIBRARY_H__ -#include <gphoto2-abilities-list.h> -#include <gphoto2-camera.h> -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-abilities-list.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-context.h> #ifdef __cplusplus extern "C" { diff --git a/libgphoto2/gphoto2-list.h b/libgphoto2/gphoto2/gphoto2-list.h index ae9fb7367..ae9fb7367 100644 --- a/libgphoto2/gphoto2-list.h +++ b/libgphoto2/gphoto2/gphoto2-list.h diff --git a/libgphoto2/gphoto2-result.h b/libgphoto2/gphoto2/gphoto2-result.h index 56781a7cc..a80c81fc5 100644 --- a/libgphoto2/gphoto2-result.h +++ b/libgphoto2/gphoto2/gphoto2-result.h @@ -25,7 +25,7 @@ #define __GPHOTO2_RESULT_H__ /* Additional error codes are defined here */ -#include <gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-result.h> #ifdef __cplusplus extern "C" { diff --git a/libgphoto2/gphoto2-setting.h b/libgphoto2/gphoto2/gphoto2-setting.h index cbf27f8c0..cbf27f8c0 100644 --- a/libgphoto2/gphoto2-setting.h +++ b/libgphoto2/gphoto2/gphoto2-setting.h diff --git a/libgphoto2/gphoto2-version.h b/libgphoto2/gphoto2/gphoto2-version.h index c7a68ec21..16abf52e3 100644 --- a/libgphoto2/gphoto2-version.h +++ b/libgphoto2/gphoto2/gphoto2-version.h @@ -23,7 +23,7 @@ #ifndef __GPHOTO2_VERSION_H__ #define __GPHOTO2_VERSION_H__ -#include <gphoto2-port-version.h> +#include <gphoto2/gphoto2-port-version.h> #ifdef __cplusplus extern "C" { diff --git a/libgphoto2/gphoto2-widget.h b/libgphoto2/gphoto2/gphoto2-widget.h index 65570d0aa..1b670168e 100644 --- a/libgphoto2/gphoto2-widget.h +++ b/libgphoto2/gphoto2/gphoto2-widget.h @@ -24,12 +24,12 @@ #ifndef __GPHOTO2_WIDGET_H__ #define __GPHOTO2_WIDGET_H__ -#include <gphoto2-context.h> +#include <gphoto2/gphoto2-context.h> /* You don't really want to know what's inside, do you? */ typedef struct _CameraWidget CameraWidget; -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> typedef enum { /* Value (get/set): */ GP_WIDGET_WINDOW, diff --git a/libgphoto2/gphoto2.h b/libgphoto2/gphoto2/gphoto2.h index fc881a656..825266427 100644 --- a/libgphoto2/gphoto2.h +++ b/libgphoto2/gphoto2/gphoto2.h @@ -41,18 +41,18 @@ extern "C" { #define CAMLIBS "." #endif -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> -#include <gphoto2-port-result.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-result.h> -#include <gphoto2-result.h> -#include <gphoto2-camera.h> -#include <gphoto2-file.h> -#include <gphoto2-filesys.h> -#include <gphoto2-library.h> -#include <gphoto2-list.h> -#include <gphoto2-setting.h> -#include <gphoto2-widget.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-file.h> +#include <gphoto2/gphoto2-filesys.h> +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-list.h> +#include <gphoto2/gphoto2-setting.h> +#include <gphoto2/gphoto2-widget.h> #ifdef __cplusplus } diff --git a/libgphoto2/jpeg.c b/libgphoto2/jpeg.c index a30d3e14f..a9a529294 100644 --- a/libgphoto2/jpeg.c +++ b/libgphoto2/jpeg.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <gphoto2-library.h> +#include <gphoto2/gphoto2-library.h> /* call example:nullpictureabort(picture,"Picture",0); */ #define nullpointerabort(pointer,name,val) \ diff --git a/libgphoto2/jpeg.h b/libgphoto2/jpeg.h index b306b60cf..bbc83e1a4 100644 --- a/libgphoto2/jpeg.h +++ b/libgphoto2/jpeg.h @@ -24,7 +24,7 @@ #ifndef __GPHOTO2_JPEG_H__ #define __GPHOTO2_JPEG_H__ -#include <gphoto2-file.h> +#include <gphoto2/gphoto2-file.h> typedef enum { JPEG_START=0xD8, JPEG_COMMENT=0xFE, JPEG_APPO=0xE0, diff --git a/libgphoto2/libgphoto2.pc.in b/libgphoto2/libgphoto2.pc.in index ab8b0dae9..b8b803863 100644 --- a/libgphoto2/libgphoto2.pc.in +++ b/libgphoto2/libgphoto2.pc.in @@ -10,4 +10,4 @@ Description: Library for easy access to digital cameras Requires: Version: @VERSION@ Libs: -L${libdir} -lgphoto2 -lgphoto2_port -lm -Cflags: -I${includedir}/gphoto2 -I${includedir} +Cflags: -I${includedir}/gphoto2 diff --git a/libgphoto2_port/configure.in b/libgphoto2_port/configure.in index f4a855495..b04bc89b9 100644 --- a/libgphoto2_port/configure.in +++ b/libgphoto2_port/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoreconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([libgphoto2_port], [0.6.1], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port]) -AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2-port.c]) +AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2/gphoto2-port.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2]) diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c index 1f5256ec8..985dff6bf 100644 --- a/libgphoto2_port/disk/disk.c +++ b/libgphoto2_port/disk/disk.c @@ -22,7 +22,7 @@ */ #include "config.h" -#include <gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-library.h> #include <stdlib.h> #include <unistd.h> @@ -55,9 +55,9 @@ #include <hal/libhal.h> #endif -#include <gphoto2-port.h> -#include <gphoto2-port-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/gphoto2-port-config.in b/libgphoto2_port/gphoto2-port-config.in index 10421b9cf..e49b22ef7 100644 --- a/libgphoto2_port/gphoto2-port-config.in +++ b/libgphoto2_port/gphoto2-port-config.in @@ -55,7 +55,7 @@ while test $# -gt 0; do ;; --cflags) - echo "-I@includedir@/gphoto2" "-I@includedir@" + echo "-I@includedir@/gphoto2" ;; --libs) diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index 59c3e3b39..beb46602d 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -1,6 +1,7 @@ lib_LTLIBRARIES = libgphoto2_port.la libgphoto2_port_la_CPPFLAGS = \ + -I$(srcdir) \ $(LTDLINCL) \ $(AM_CPPFLAGS) $(CPPFLAGS) @@ -40,31 +41,30 @@ libgphoto2_port_la_SOURCES = \ gphoto2-port-info-list.c \ gphoto2-port-log.c \ gphoto2-port-version.c \ - gphoto2-port-version.h \ - gphoto2-port-library.h \ gphoto2-port.c \ gphoto2-port-portability.c \ gphoto2-port-result.c libgphoto2_port_la_DEPENDENCIES = \ + gphoto2/gphoto2-port-version.h \ + gphoto2/gphoto2-port-library.h \ $(LIBLTDL) \ $(srcdir)/libgphoto2_port.sym # ship headers -libgphoto2_portincludedir = $(includedir)/gphoto2 -libgphoto2_portinclude_HEADERS = \ - gphoto2-port.h \ - gphoto2-port-info-list.h \ - gphoto2-port-log.h \ - gphoto2-port-version.h \ - gphoto2-port-portability.h \ - gphoto2-port-result.h +nobase_include_HEADERS = \ + gphoto2/gphoto2-port.h \ + gphoto2/gphoto2-port-info-list.h \ + gphoto2/gphoto2-port-log.h \ + gphoto2/gphoto2-port-version.h \ + gphoto2/gphoto2-port-portability.h \ + gphoto2/gphoto2-port-result.h # Note: If you have problem with this file not being put into # the source tarball correctly at "make dist", this may # be the result of tar not creating archives with >99 # characters of path length. -EXTRA_DIST = gphoto2-port-portability-os2.h libgphoto2_port.sym +EXTRA_DIST = gphoto2/gphoto2-port-portability-os2.h gphoto2/gphoto2-port-library.h libgphoto2_port.sym ../libltdl/libltdlc.la: cd ../libltdl && $(MAKE) libltdlc.la @@ -79,9 +79,9 @@ EXTRA_DIST = gphoto2-port-portability-os2.h libgphoto2_port.sym # #include <gphoto2/gphoto2-camera.h> install-data-local: - $(INSTALL) -m 0755 -d $(DESTDIR)$(libgphoto2_portincludedir) - rm -f $(DESTDIR)$(libgphoto2_portincludedir)/gphoto2 - $(LN_S) . $(DESTDIR)$(libgphoto2_portincludedir)/gphoto2 + rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2 + $(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/gphoto2 + $(LN_S) . $(DESTDIR)$(includedir)/gphoto2/gphoto2 uninstall-local: - rm -f $(DESTDIR)$(libgphoto2_portincludedir)/gphoto2 + rm -f $(DESTDIR)$(includedir)/gphoto2/gphoto2 diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index 356358bee..3764c424f 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -21,7 +21,7 @@ #define _GPHOTO2_INTERNAL_CODE #include "config.h" -#include "gphoto2-port-info-list.h" +#include <gphoto2/gphoto2-port-info-list.h> #include <stdlib.h> #include <string.h> @@ -34,9 +34,9 @@ #include <ltdl.h> -#include <gphoto2-port-result.h> -#include <gphoto2-port-library.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c index a0036e8ac..22f2db75d 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c @@ -21,14 +21,14 @@ #define _GPHOTO2_INTERNAL_CODE #include "config.h" -#include "gphoto2-port-log.h" +#include <gphoto2/gphoto2-port-log.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> #include <stdio.h> -#include <gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-result.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c index 4840f1480..b58e5a4f6 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c @@ -3,8 +3,8 @@ #include "config.h" #include <stdio.h> -#include <gphoto2-port.h> -#include <gphoto2-port-result.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-result.h> /* Windows Portability ------------------------------------------------------------------ */ diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c index a50cb3069..10138f952 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include <gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-result.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -64,6 +64,8 @@ gp_port_result_as_string (int result) return _("Bad parameters"); case GP_ERROR_NOT_SUPPORTED: return _("Unsupported operation"); + case GP_ERROR_FIXED_LIMIT_EXCEEDED: + return _("Fixed limit exceeded"); case GP_ERROR_TIMEOUT: return _("Timeout reading from or writing to the port"); case GP_ERROR_IO_SUPPORTED_SERIAL: diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c index 96d25d316..bd403b735 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c @@ -21,7 +21,7 @@ #include "config.h" #include <stdlib.h> -#include <gphoto2-port-version.h> +#include <gphoto2/gphoto2-port-version.h> const char **gp_port_library_version(GPVersionVerbosity verbose) { diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index f9a0c47bb..f79dc1afb 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -21,7 +21,7 @@ */ #include "config.h" -#include "gphoto2-port.h" +#include <gphoto2/gphoto2-port.h> #include <stdarg.h> #include <stdlib.h> @@ -30,10 +30,10 @@ #include <ltdl.h> -#include "gphoto2-port-result.h" -#include "gphoto2-port-info-list.h" -#include "gphoto2-port-library.h" -#include "gphoto2-port-log.h" +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-info-list.h index 8125220e7..3505b7132 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-info-list.h @@ -39,14 +39,14 @@ struct _GPPortInfo { char library_filename[1024]; }; -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #ifdef _GPHOTO2_INTERNAL_CODE -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-log.h> extern const StringFlagItem gpi_gphoto_port_type_map[]; #endif diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-library.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-library.h index 51a974353..ea1fc98f4 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-library.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-library.h @@ -21,8 +21,8 @@ #ifndef __GPHOTO2_PORT_LIBRARY_H__ #define __GPHOTO2_PORT_LIBRARY_H__ -#include <gphoto2-port-info-list.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-port.h> typedef struct _GPPortOperations GPPortOperations; struct _GPPortOperations { diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-log.h index 3dd28557e..3dd28557e 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-log.h diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability-os2.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability-os2.h index c8194b184..c8194b184 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability-os2.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability-os2.h diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability.h index 14f9f8cff..14f9f8cff 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-portability.h diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-result.h index bdc341659..427837df5 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-result.h @@ -30,6 +30,7 @@ #define GP_ERROR_UNKNOWN_PORT -5 #define GP_ERROR_NOT_SUPPORTED -6 #define GP_ERROR_IO -7 +#define GP_ERROR_FIXED_LIMIT_EXCEEDED -8 #define GP_ERROR_TIMEOUT -10 diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-version.h index 8a11735ed..8a11735ed 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port-version.h diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.h b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port.h index aa0805357..5645bf298 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.h +++ b/libgphoto2_port/libgphoto2_port/gphoto2/gphoto2-port.h @@ -21,12 +21,12 @@ #ifndef __GPHOTO2_PORT_H__ #define __GPHOTO2_PORT_H__ -#include <gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-port-info-list.h> /* For portability */ -#include <gphoto2-port-portability.h> +#include <gphoto2/gphoto2-port-portability.h> #ifdef OS2 -#include <gphoto2-port-portability-os2.h> +#include <gphoto2/gphoto2-port-portability-os2.h> #include <os2.h> #endif diff --git a/libgphoto2_port/ptpip/ptpip.c b/libgphoto2_port/ptpip/ptpip.c index cd47e38d0..11c6235bd 100644 --- a/libgphoto2_port/ptpip/ptpip.c +++ b/libgphoto2_port/ptpip/ptpip.c @@ -20,7 +20,7 @@ */ #include "config.h" -#include <gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-library.h> #include <stdlib.h> #include <unistd.h> @@ -37,9 +37,9 @@ #endif #include <string.h> -#include <gphoto2-port.h> -#include <gphoto2-port-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 72d761eaa..17045166a 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -28,7 +28,7 @@ */ #include "config.h" -#include <gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-library.h> #include <stdlib.h> #include <stdio.h> @@ -73,9 +73,9 @@ # include <lockdev.h> #endif -#include <gphoto2-port-result.h> -#include <gphoto2-port-log.h> -#include <gphoto2-port.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-port.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/test/test-gp-port.c b/libgphoto2_port/test/test-gp-port.c index f0e79b976..f2d11935c 100644 --- a/libgphoto2_port/test/test-gp-port.c +++ b/libgphoto2_port/test/test-gp-port.c @@ -23,10 +23,10 @@ #include <stdlib.h> #include <string.h> -#include <gphoto2-port.h> -#include <gphoto2-port-log.h> -#include <gphoto2-port-result.h> -#include <gphoto2-port-info-list.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-info-list.h> static void log_func (GPLogLevel level, const char *domain, diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 212786e9f..06cde8621 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -20,7 +20,7 @@ * Boston, MA 02111-1307, USA. */ #include "config.h" -#include <gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-library.h> #include <stdlib.h> #include <unistd.h> @@ -34,9 +34,9 @@ #include <usb.h> -#include <gphoto2-port.h> -#include <gphoto2-port-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-port.h> +#include <gphoto2/gphoto2-port-result.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef ENABLE_NLS # include <libintl.h> diff --git a/libgphoto2_port/usb/usb-os2.c b/libgphoto2_port/usb/usb-os2.c index 5d52a23d1..c99e9bb56 100644 --- a/libgphoto2_port/usb/usb-os2.c +++ b/libgphoto2_port/usb/usb-os2.c @@ -31,7 +31,7 @@ #include <string.h> /*#include <usb.h>*/ -#include "gphoto2-port.h" +#include <gphoto2/gphoto2-port.h> int gp_port_usb_list(gp_port_info *list, int *count); diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index a1c7810ec..ae56c5589 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -53,13 +53,8 @@ ARGV0 " prints the camera list in the specified format FORMAT on stdout.\n" \ #include <time.h> #include <string.h> -/* NOTE: If you want to build a similar program outside the - * libgphoto2 package, use - * #include <gphoto2/gphoto2-foo.h> - * !!!! - */ -#include <gphoto2-camera.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-port-log.h> #ifndef TRUE #define TRUE (0==0) diff --git a/packaging/linux-hotplug/print-usb-usermap.c b/packaging/linux-hotplug/print-usb-usermap.c index abb441d00..fd98caad8 100644 --- a/packaging/linux-hotplug/print-usb-usermap.c +++ b/packaging/linux-hotplug/print-usb-usermap.c @@ -54,8 +54,8 @@ ARGV0 " prints the lines for the usb.usermap file on stdout.\n" \ #include <time.h> #include <string.h> -#include <gphoto2-camera.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-port-log.h> #ifndef TRUE #define TRUE (0==0) diff --git a/tests/test-camera-list.c b/tests/test-camera-list.c index 791b38203..f2d28c5d8 100644 --- a/tests/test-camera-list.c +++ b/tests/test-camera-list.c @@ -26,9 +26,9 @@ #include <time.h> #include <sys/time.h> -#include "gphoto2-port-log.h" -#include "gphoto2-camera.h" -#include "gphoto2-port-portability.h" +#include <gphoto2/gphoto2-port-log.h> +#include <gphoto2/gphoto2-camera.h> +#include <gphoto2/gphoto2-port-portability.h> #define CHECK(f) {int res = f; if (res < 0) {printf ("ERROR: %s\n", gp_result_as_string (res)); return (1);}} diff --git a/tests/test-filesys.c b/tests/test-filesys.c index a0147f957..531cc02d0 100644 --- a/tests/test-filesys.c +++ b/tests/test-filesys.c @@ -26,9 +26,9 @@ #include <mcheck.h> #endif -#include <gphoto2-filesys.h> -#include <gphoto2-result.h> -#include <gphoto2-port-log.h> +#include <gphoto2/gphoto2-filesys.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-port-log.h> #ifdef __GNUC__ diff --git a/tests/test-gphoto2.c b/tests/test-gphoto2.c index 082fc68c5..b05735a65 100644 --- a/tests/test-gphoto2.c +++ b/tests/test-gphoto2.c @@ -24,7 +24,7 @@ #include <mcheck.h> #endif -#include <gphoto2-camera.h> +#include <gphoto2/gphoto2-camera.h> #define CHECK(f) {int res = f; if (res < 0) {printf ("ERROR: %s\n", gp_result_as_string (res)); return (1);}} |