Merge branch 'master' of ssh://git.claws-mail.org/home/git/claws

[claws.git] / src / plugins / address_keeper / Makefile.am

diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 48acae0ec51bb3fcd8139dd2d5966a68bd2cc461..a63531c393a770a44513886cec428a1df09eda9e 100644 (file)
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -1,9 +1,15 @@
 EXTRA_DIST = claws.def plugin.def version.rc
 
 EXTRA_DIST = claws.def plugin.def version.rc
 

+IFLAGS = \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/common \
+       -I$(top_builddir)/src/common \
+       -I$(top_srcdir)/src/gtk
+

 if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
 if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \

-     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+     `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \

      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
 
 %.lo : %.rc
      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
 
 %.lo : %.rc


@@ -57,13 +63,8 @@ address_keeper_la_DEPENDENCIES = $(plugin_deps)
 address_keeper_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
        $(GTK_LIBS)
 
 address_keeper_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
        $(GTK_LIBS)
 

-INCLUDES = \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/common \
-       -I$(top_builddir)/src/common \
-       -I$(top_srcdir)/src/gtk
-
-AM_CPPFLAGS = \
+address_keeper_la_CPPFLAGS = \
+       $(IFLAGS) \

        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)