And if we found Emap and it wasn't disabled, we may as well not break the build.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61780 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 2cdcaa7..dc3a820 100644 (file)
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -18,6 +18,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@ \
 @EIO_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
@@ -74,7 +75,7 @@ widget_preview_gengrid \
 widget_preview_progressbar \
 widget_preview_box
 
-LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
+LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
 
 endif
 

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 64eb99f..9f9ca44 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -18,6 +18,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@ \
 @EIO_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
@@ -116,6 +117,7 @@ elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_EMAP_LIBS@ \
        @ELEMENTARY_LIBS@ \
        @EIO_LIBS@ \
        @my_libs@
@@ -128,6 +130,7 @@ elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_EMAP_LIBS@ \
        @ELEMENTARY_LIBS@ \
        @my_libs@
 elementary_config_LDFLAGS =
@@ -138,6 +141,7 @@ elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_EMAP_LIBS@ \
        @ELEMENTARY_LIBS@ \
        @my_libs@
 elementary_quicklaunch_LDFLAGS =
@@ -167,6 +171,7 @@ elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_EMAP_LIBS@ \
        @ELEMENTARY_LIBS@ \
        @EIO_LIBS@
        @my_libs@

diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index a606254..0240ccb 100644 (file)
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WINCE_CFLAGS@ \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
-@ELEMENTARY_ETHUMB_CFLAGS@
+@ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 24dc419..521437d 100644 (file)
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_CFLAGS@
 
 LDADD = \

diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 7f7e05b..ebeb949 100644 (file)
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WINCE_CFLAGS@ \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
-@ELEMENTARY_ETHUMB_CFLAGS@
+@ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD

diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index d789ce9..6c2dc6e 100644 (file)
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WINCE_CFLAGS@ \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
-@ELEMENTARY_ETHUMB_CFLAGS@
+@ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD