forked from enlightenment/efl
And if we found Emap and it wasn't disabled, we may as well not break the build.
SVN revision: 61780
This commit is contained in:
parent
2bf15a56bd
commit
7f82a14061
|
@ -18,6 +18,7 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@ \
|
||||||
@EIO_CFLAGS@
|
@EIO_CFLAGS@
|
||||||
|
|
||||||
if ELEMENTARY_WINDOWS_BUILD
|
if ELEMENTARY_WINDOWS_BUILD
|
||||||
|
@ -74,7 +75,7 @@ widget_preview_gengrid \
|
||||||
widget_preview_progressbar \
|
widget_preview_progressbar \
|
||||||
widget_preview_box
|
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
|
endif
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@ \
|
||||||
@EIO_CFLAGS@
|
@EIO_CFLAGS@
|
||||||
|
|
||||||
if ELEMENTARY_WINDOWS_BUILD
|
if ELEMENTARY_WINDOWS_BUILD
|
||||||
|
@ -116,6 +117,7 @@ elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
|
||||||
@ELEMENTARY_EWEATHER_LIBS@ \
|
@ELEMENTARY_EWEATHER_LIBS@ \
|
||||||
@ELEMENTARY_EDBUS_LIBS@ \
|
@ELEMENTARY_EDBUS_LIBS@ \
|
||||||
@ELEMENTARY_EFREET_LIBS@ \
|
@ELEMENTARY_EFREET_LIBS@ \
|
||||||
|
@ELEMENTARY_EMAP_LIBS@ \
|
||||||
@ELEMENTARY_LIBS@ \
|
@ELEMENTARY_LIBS@ \
|
||||||
@EIO_LIBS@ \
|
@EIO_LIBS@ \
|
||||||
@my_libs@
|
@my_libs@
|
||||||
|
@ -128,6 +130,7 @@ elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
|
||||||
@ELEMENTARY_EWEATHER_LIBS@ \
|
@ELEMENTARY_EWEATHER_LIBS@ \
|
||||||
@ELEMENTARY_EDBUS_LIBS@ \
|
@ELEMENTARY_EDBUS_LIBS@ \
|
||||||
@ELEMENTARY_EFREET_LIBS@ \
|
@ELEMENTARY_EFREET_LIBS@ \
|
||||||
|
@ELEMENTARY_EMAP_LIBS@ \
|
||||||
@ELEMENTARY_LIBS@ \
|
@ELEMENTARY_LIBS@ \
|
||||||
@my_libs@
|
@my_libs@
|
||||||
elementary_config_LDFLAGS =
|
elementary_config_LDFLAGS =
|
||||||
|
@ -138,6 +141,7 @@ elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
|
||||||
@ELEMENTARY_EWEATHER_LIBS@ \
|
@ELEMENTARY_EWEATHER_LIBS@ \
|
||||||
@ELEMENTARY_EDBUS_LIBS@ \
|
@ELEMENTARY_EDBUS_LIBS@ \
|
||||||
@ELEMENTARY_EFREET_LIBS@ \
|
@ELEMENTARY_EFREET_LIBS@ \
|
||||||
|
@ELEMENTARY_EMAP_LIBS@ \
|
||||||
@ELEMENTARY_LIBS@ \
|
@ELEMENTARY_LIBS@ \
|
||||||
@my_libs@
|
@my_libs@
|
||||||
elementary_quicklaunch_LDFLAGS =
|
elementary_quicklaunch_LDFLAGS =
|
||||||
|
@ -167,6 +171,7 @@ elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
|
||||||
@ELEMENTARY_EWEATHER_LIBS@ \
|
@ELEMENTARY_EWEATHER_LIBS@ \
|
||||||
@ELEMENTARY_EDBUS_LIBS@ \
|
@ELEMENTARY_EDBUS_LIBS@ \
|
||||||
@ELEMENTARY_EFREET_LIBS@ \
|
@ELEMENTARY_EFREET_LIBS@ \
|
||||||
|
@ELEMENTARY_EMAP_LIBS@ \
|
||||||
@ELEMENTARY_LIBS@ \
|
@ELEMENTARY_LIBS@ \
|
||||||
@EIO_LIBS@
|
@EIO_LIBS@
|
||||||
@my_libs@
|
@my_libs@
|
||||||
|
|
|
@ -16,7 +16,8 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_WINCE_CFLAGS@ \
|
@ELEMENTARY_WINCE_CFLAGS@ \
|
||||||
@ELEMENTARY_EDBUS_CFLAGS@ \
|
@ELEMENTARY_EDBUS_CFLAGS@ \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@
|
||||||
|
|
||||||
if ELEMENTARY_WINDOWS_BUILD
|
if ELEMENTARY_WINDOWS_BUILD
|
||||||
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
||||||
|
|
|
@ -16,6 +16,7 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_EDBUS_CFLAGS@ \
|
@ELEMENTARY_EDBUS_CFLAGS@ \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@ \
|
||||||
@ELEMENTARY_CFLAGS@
|
@ELEMENTARY_CFLAGS@
|
||||||
|
|
||||||
LDADD = \
|
LDADD = \
|
||||||
|
|
|
@ -16,7 +16,8 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_WINCE_CFLAGS@ \
|
@ELEMENTARY_WINCE_CFLAGS@ \
|
||||||
@ELEMENTARY_EDBUS_CFLAGS@ \
|
@ELEMENTARY_EDBUS_CFLAGS@ \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@
|
||||||
|
|
||||||
if ELEMENTARY_WINDOWS_BUILD
|
if ELEMENTARY_WINDOWS_BUILD
|
||||||
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
||||||
|
|
|
@ -16,7 +16,8 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_WINCE_CFLAGS@ \
|
@ELEMENTARY_WINCE_CFLAGS@ \
|
||||||
@ELEMENTARY_EDBUS_CFLAGS@ \
|
@ELEMENTARY_EDBUS_CFLAGS@ \
|
||||||
@ELEMENTARY_EFREET_CFLAGS@ \
|
@ELEMENTARY_EFREET_CFLAGS@ \
|
||||||
@ELEMENTARY_ETHUMB_CFLAGS@
|
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||||
|
@ELEMENTARY_EMAP_CFLAGS@
|
||||||
|
|
||||||
if ELEMENTARY_WINDOWS_BUILD
|
if ELEMENTARY_WINDOWS_BUILD
|
||||||
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
AM_CPPFLAGS += -DELEMENTARY_BUILD
|
||||||
|
|
Loading…
Reference in New Issue