From 7f82a14061640b7ba5b57c08083c6df442cf92d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Tue, 26 Jul 2011 21:36:14 +0000 Subject: [PATCH] And if we found Emap and it wasn't disabled, we may as well not break the build. SVN revision: 61780 --- legacy/elementary/doc/widgets/Makefile.am | 3 ++- legacy/elementary/src/bin/Makefile.am | 5 +++++ legacy/elementary/src/edje_externals/Makefile.am | 3 ++- legacy/elementary/src/examples/Makefile.am | 1 + legacy/elementary/src/modules/test_entry/Makefile.am | 3 ++- legacy/elementary/src/modules/test_map/Makefile.am | 3 ++- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/doc/widgets/Makefile.am b/legacy/elementary/doc/widgets/Makefile.am index 2cdcaa7be2..dc3a82084d 100644 --- a/legacy/elementary/doc/widgets/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am index 64eb99f247..9f9ca443fd 100644 --- a/legacy/elementary/src/bin/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am index a606254236..0240ccb863 100644 --- a/legacy/elementary/src/edje_externals/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/examples/Makefile.am b/legacy/elementary/src/examples/Makefile.am index 24dc419d86..521437d547 100644 --- a/legacy/elementary/src/examples/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/modules/test_entry/Makefile.am b/legacy/elementary/src/modules/test_entry/Makefile.am index 7f7e05b19b..ebeb949997 100644 --- a/legacy/elementary/src/modules/test_entry/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/modules/test_map/Makefile.am b/legacy/elementary/src/modules/test_map/Makefile.am index d789ce9985..6c2dc6eaf6 100644 --- a/legacy/elementary/src/modules/test_map/Makefile.am +++ b/legacy/elementary/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