CVS commit by deller: 

kdepimmacros.h fixes.


  M +2 -1      plugins/kaddressbook/Makefile.am   1.12
  M +2 -1      plugins/kmail/Makefile.am   1.14
  M +2 -1      plugins/korganizer/Makefile.am   1.17
  M +2 -1      plugins/newsticker/Makefile.am   1.10
  M +3 -1      plugins/specialdates/Makefile.am   1.2
  M +3 -1      plugins/summary/Makefile.am   1.9
  M +2 -2      src/Makefile.am   1.32


--- kdepim/kontact/plugins/kaddressbook/Makefile.am  #1.11:1.12
@@ -1,3 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_builddir)/libkdepim \
+   -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes)
 
 kde_module_LTLIBRARIES = libkontact_kaddressbookplugin.la kcm_kabsummary.la

--- kdepim/kontact/plugins/kmail/Makefile.am  #1.13:1.14
@@ -1,3 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_srcdir)/libkdepim \
+INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail \
+           -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
            -I$(top_srcdir) $(all_includes)
 

--- kdepim/kontact/plugins/korganizer/Makefile.am  #1.16:1.17
@@ -1,4 +1,5 @@
 # top_srcdir/korganizer is a hack, to get korganizeriface.h
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim \
+INCLUDES = -I$(top_srcdir)/kontact/interfaces \
+  -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
   -I$(top_srcdir)/korganizer \
   -I$(top_srcdir) $(all_includes)

--- kdepim/kontact/plugins/newsticker/Makefile.am  #1.9:1.10
@@ -1,3 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim \
+INCLUDES = -I$(top_srcdir)/kontact/interfaces \
+     -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
      -I$(top_srcdir) $(all_includes)
 

--- kdepim/kontact/plugins/specialdates/Makefile.am  #1.1:1.2
@@ -1,3 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kontact/interfaces \
+  -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir) $(all_includes)
 
 kde_module_LTLIBRARIES = libkontact_specialdatesplugin.la kcm_sdsummary.la

--- kdepim/kontact/plugins/summary/Makefile.am  #1.8:1.9
@@ -1,3 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
+  -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir) $(all_includes)
 
 kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la

--- kdepim/kontact/src/Makefile.am  #1.31:1.32
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libkdepim -I$(top_srcdir)/kontact/interfaces \
-  -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES = libkontact.la