[Kde-imaging] extragear/libs/kipi-plugins

[Angelo Naselli]

SVN commit 592295 by anaselli:

fix problem using automake & co. 
- added KIPI_PLUGINS_COMMON_INCLUDE into configure.in.in
  (please test it for regressions)

CCMAIL:  kde-imaging at kde.org

 M  +1 -2      acquireimages/Makefile.am  
 M  +2 -2      batchprocessimages/Makefile.am  
 M  +2 -2      calendar/Makefile.am  
 M  +2 -2      cdarchiving/Makefile.am  
 M  +2 -2      common/exiv2iface/Makefile.am  
 M  +5 -0      configure.in.in  
 M  +2 -2      findimages/Makefile.am  
 M  +1 -2      flickrexport/Makefile.am  
 M  +2 -2      galleryexport/Makefile.am  
 M  +1 -3      gpssync/Makefile.am  
 M  +2 -2      htmlexport/Makefile.am  
 M  +2 -2      imagesgallery/Makefile.am  
 M  +1 -3      jpeglossless/Makefile.am  
 M  +1 -2      kameraklient/Makefile.am  
 M  +2 -2      mpegencoder/Makefile.am  
 M  +2 -2      printwizard/Makefile.am  
 M  +1 -3      rawconverter/Makefile.am  
 M  +2 -2      sendimages/Makefile.am  
 M  +2 -2      simpleviewerexport/Makefile.am  
 M  +1 -2      slideshow/Makefile.am  
 M  +1 -3      timeadjust/Makefile.am  


--- trunk/extragear/libs/kipi-plugins/acquireimages/Makefile.am #592294:592295
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/batchprocessimages/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 SUBDIRS = data
 
--- trunk/extragear/libs/kipi-plugins/calendar/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/cdarchiving/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 SUBDIRS = autorun
 
--- trunk/extragear/libs/kipi-plugins/common/exiv2iface/Makefile.am #592294:592295
@@ -10,5 +10,5 @@
 
 libexiv2iface_la_LIBADD = $(LIB_EXIV2) $(LIB_KDECORE) $(LIB_QT)
 
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	       $(LIBKIPI_CFLAGS) $(all_includes) 
\ No newline at end of file
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
--- trunk/extragear/libs/kipi-plugins/configure.in.in #592294:592295
@@ -5,6 +5,11 @@
 # END PKG-CONFIG CHECK
 ###############################################################################
 
+# common header files path for kipi-plugins
+KIPI_PLUGINS_COMMON_INCLUDE="-I\$(top_srcdir)/kipi-plugins/common/include \
+                             -I\$(top_srcdir)/kipi-plugins/common/exiv2iface" 
+AC_SUBST(KIPI_PLUGINS_COMMON_INCLUDE)
+
 KDE_ENABLE_HIDDEN_VISIBILITY
 
 # ----------------------------------------------------------
--- trunk/extragear/libs/kipi-plugins/findimages/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/flickrexport/Makefile.am #592294:592295
@@ -1,7 +1,6 @@
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = kipiplugin_flickrexport.la
--- trunk/extragear/libs/kipi-plugins/galleryexport/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/gpssync/Makefile.am #592294:592295
@@ -1,6 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	       -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
-	       $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 
 METASOURCES = AUTO
 
--- trunk/extragear/libs/kipi-plugins/htmlexport/Makefile.am #592294:592295
@@ -1,6 +1,6 @@
 SUBDIRS     = themes
-INCLUDES    =  -I$(top_srcdir)/kipi-plugins/common/include \
-	           $(LIBKIPI_CFLAGS) $(all_includes) $(LIBXSLT_CFLAGS)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) $(LIBXSLT_CFLAGS)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/imagesgallery/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/jpeglossless/Makefile.am #592294:592295
@@ -1,7 +1,5 @@
 METASOURCES  = AUTO
-INCLUDES     = -I$(top_srcdir)/kipi-plugins/common/include \
-	           -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
-	           $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 
 # --enable-final triggers: http://bugs.kde.org/show_bug.cgi?id=126326
 # digikam: camera download: auto-rotated images loose EXIF info ...
--- trunk/extragear/libs/kipi-plugins/kameraklient/Makefile.am #592294:592295
@@ -1,6 +1,5 @@
 ## Makefile.am for kameraklient
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
 
 METASOURCES = AUTO
 
--- trunk/extragear/libs/kipi-plugins/mpegencoder/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/printwizard/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/rawconverter/Makefile.am #592294:592295
@@ -1,9 +1,7 @@
 METASOURCES = AUTO
 SUBDIRS = profiles
 
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	       -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
-	       $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = kipiplugin_rawconverter.la
--- trunk/extragear/libs/kipi-plugins/sendimages/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/simpleviewerexport/Makefile.am #592294:592295
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/slideshow/Makefile.am #592294:592295
@@ -1,5 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	   $(IMLIB2_CFLAGS)  $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(IMLIB2_CFLAGS)  $(LIBKIPI_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
--- trunk/extragear/libs/kipi-plugins/timeadjust/Makefile.am #592294:592295
@@ -1,6 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/include \
-	       -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
-	       $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
 
 METASOURCES = AUTO