Consistently use #include <gphoto2/gphoto2-foo.h> everywhere.

This moves the header files to a new subdirectory gphoto2 in both
  libgphoto2 and libphoto2_port/libgphoto2. All references are
  adapted appropriately.



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9221 67ed7778-7388-44ab-90cf-0a291f65f57c

HACKING

@@ -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. */
 

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

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>

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"
 

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>

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"
 

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;
 

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"
 

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>

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"

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>

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>

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>

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"

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"

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

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"

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);
 

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>

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"
 

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"

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;

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

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" 

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" 

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;

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"
 

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)
 {

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>

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

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

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"
 

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>

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))

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);}
 

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>

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>

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>

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 {

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"
 

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"

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

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>

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"
 

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" 

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.

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"
 

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>
 

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>

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>

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>
 

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);

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>

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"

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>

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"

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>

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"

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);

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"
 

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

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

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"
 

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

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"
 

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"
 

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 

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"
 

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"
 

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 *);

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

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"
 

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"

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 {

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"
 

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;
 

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"
 

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"
 

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"
 

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;
 

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>
 

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"

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"

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"

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"

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"

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>

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>

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 */

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"

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

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"
 

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"
 

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);}
 

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"
 

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"
 

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*/

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"
 

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"

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"