Fix usb, disk and ptpip iolibs to not pick up old gphoto2 headers

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

7 files changed, 23 insertions, 13 deletions

diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am
index 2cc9216fc..66d8c8ce1 100644
--- a/libgphoto2/Makefile.am
+++ b/libgphoto2/Makefile.am
@@ -12,8 +12,8 @@ lib_LTLIBRARIES = libgphoto2.la
 # Yes, this is messy, but we are going to clean this up.
 
 libgphoto2_la_CPPFLAGS =				\
-	$(LTDLINCL)					\
 	$(AM_CPPFLAGS) $(CPPFLAGS)			\
+	$(LTDLINCL)					\
 	$(LIBEXIF_CFLAGS)
 
 libgphoto2_la_LDFLAGS =	\
diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am
index a69cf091b..f9c7283f5 100644
--- a/libgphoto2_port/Makefile.am
+++ b/libgphoto2_port/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Specify some includes and versioning
-INCLUDES = -I@srcdir@ $(VERSION_FLAGS)
 VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@LIBGPPORT_VERSION@\" -DHAVE_TERMIOS_H
+AM_CPPFLAGS = -I@srcdir@ $(VERSION_FLAGS)
 
 ## Executable files
 bin_SCRIPTS = gphoto2-port-config
diff --git a/libgphoto2_port/NEWS b/libgphoto2_port/NEWS
index 71d63f754..a66dc40e2 100644
--- a/libgphoto2_port/NEWS
+++ b/libgphoto2_port/NEWS
@@ -1,3 +1,10 @@
+libgphoto2_port 0.7.1
+
+Build:
+   * Fix usb, disk and ptpip iolibs to not pick up old gphoto2 headers.
+
+------------------------------------------------------------------------
+
 libgphoto2_port 0.7.0
 
    * Added a few internal functions.
diff --git a/libgphoto2_port/disk/Makefile.am b/libgphoto2_port/disk/Makefile.am
index a3cb947c4..7950f9026 100644
--- a/libgphoto2_port/disk/Makefile.am
+++ b/libgphoto2_port/disk/Makefile.am
@@ -6,10 +6,11 @@ disk_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 disk_la_CPPFLAGS = \
-	$(INTL_CFLAGS) \
 	$(AM_CPPFLAGS) \
-	$(LIBUSB_CFLAGS) $(HAL_CFLAGS) \
-	$(CPPFLAGS)
+	$(CPPFLAGS) \
+	$(INTL_CFLAGS) \
+	$(LIBUSB_CFLAGS) \
+	$(HAL_CFLAGS)
 disk_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 disk_la_LIBADD = \
 	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am
index 7248b9905..a7c1e9da1 100644
--- a/libgphoto2_port/libgphoto2_port/Makefile.am
+++ b/libgphoto2_port/libgphoto2_port/Makefile.am
@@ -2,8 +2,9 @@ lib_LTLIBRARIES = libgphoto2_port.la
 
 libgphoto2_port_la_CPPFLAGS = \
 	-I$(srcdir) \
-	$(LTDLINCL)					\
-	$(AM_CPPFLAGS) $(CPPFLAGS)
+	$(AM_CPPFLAGS) \
+	$(CPPFLAGS) \
+	$(LTDLINCL)
 
 # Notes about the list of exported symbols:
 #    gp_* also contains internal symbols which are intended for
diff --git a/libgphoto2_port/ptpip/Makefile.am b/libgphoto2_port/ptpip/Makefile.am
index 945401d33..1daae6559 100644
--- a/libgphoto2_port/ptpip/Makefile.am
+++ b/libgphoto2_port/ptpip/Makefile.am
@@ -6,9 +6,9 @@ ptpip_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 ptpip_la_CPPFLAGS = \
-	$(INTL_CFLAGS) \
 	$(AM_CPPFLAGS) \
-	$(CPPFLAGS) 
+	$(CPPFLAGS) \
+	$(INTL_CFLAGS)
 ptpip_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 ptpip_la_LIBADD = $(top_builddir)/libgphoto2_port/libgphoto2_port.la @MDNS_LIBS@
 ptpip_la_SOURCES = ptpip.c
diff --git a/libgphoto2_port/usb/Makefile.am b/libgphoto2_port/usb/Makefile.am
index 5b115aba7..ced574bd3 100644
--- a/libgphoto2_port/usb/Makefile.am
+++ b/libgphoto2_port/usb/Makefile.am
@@ -6,12 +6,13 @@ usb_la_LDFLAGS = -module -no-undefined -avoid-version \
 	-export-dynamic \
         -export-symbols $(top_srcdir)/iolib.sym
 usb_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(CPPFLAGS) \
 	$(INTL_CFLAGS) \
-	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
-	$(CPPFLAGS)
+	$(LIBUSB_CFLAGS)
 usb_la_DEPENDENCIES = $(top_srcdir)/iolib.sym
 usb_la_LIBADD = \
+	$(top_builddir)/libgphoto2_port/libgphoto2_port.la \
 	$(LIBUSB_LIBS)			\
-	$(INTLLIBS)			\
-	$(top_builddir)/libgphoto2_port/libgphoto2_port.la
+	$(INTLLIBS)
 usb_la_SOURCES = libusb.c