summaryrefslogtreecommitdiff
path: root/legacy/embryo
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-02-24 15:22:11 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-02-24 15:22:11 +0000
commit124d95895445980a060fe3e10f08565fd25aeec0 (patch)
tree23e705c24c335ec8b629210575909a5ff4ff8d08 /legacy/embryo
parent22ed9fcfab675a4104a87a56fd6b8e943c953dde (diff)
embryo: try to handle _LIBS appropriatly.
SVN revision: 68419
Diffstat (limited to 'legacy/embryo')
-rw-r--r--legacy/embryo/configure.ac2
-rw-r--r--legacy/embryo/src/bin/Makefile.am3
-rw-r--r--legacy/embryo/src/lib/Makefile.am3
3 files changed, 4 insertions, 4 deletions
diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac
index df343faddf..1ff8b4ded0 100644
--- a/legacy/embryo/configure.ac
+++ b/legacy/embryo/configure.ac
@@ -118,8 +118,6 @@ PKG_CHECK_MODULES([EXOTIC],
118 118
119if test "x${enable_exotic}" = "xyes"; then 119if test "x${enable_exotic}" = "xyes"; then
120 requirement_embryo="exotic ${requirement_embryo}" 120 requirement_embryo="exotic ${requirement_embryo}"
121 EINA_CFLAGS="${EINA_CFLAGS} ${EXOTIC_CFLAGS}"
122 EINA_LIBS="${EXOTIC_LIBS}"
123 121
124 AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.]) 122 AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.])
125fi 123fi
diff --git a/legacy/embryo/src/bin/Makefile.am b/legacy/embryo/src/bin/Makefile.am
index 09f6ffd23b..e5e670c3ab 100644
--- a/legacy/embryo/src/bin/Makefile.am
+++ b/legacy/embryo/src/bin/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
10-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 10-DPACKAGE_LIB_DIR=\"$(libdir)\" \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
12@EINA_CFLAGS@ \ 12@EINA_CFLAGS@ \
13@EMBRYO_CFLAGS@ \
13@EVIL_CFLAGS@ 14@EVIL_CFLAGS@
14 15
15bin_PROGRAMS = @EMBRYO_CC_PRG@ 16bin_PROGRAMS = @EMBRYO_CC_PRG@
@@ -32,7 +33,7 @@ embryo_cc_prefix.c \
32embryo_cc_prefix.h 33embryo_cc_prefix.h
33 34
34embryo_cc_CFLAGS = @EMBRYO_CFLAGS@ 35embryo_cc_CFLAGS = @EMBRYO_CFLAGS@
35embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_LIBS@ -lm 36embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EMBRYO_LIBS@ @EINA_LIBS@ -lm
36embryo_cc_LDFLAGS = @lt_enable_auto_import@ 37embryo_cc_LDFLAGS = @lt_enable_auto_import@
37 38
38EXTRA_DIST = \ 39EXTRA_DIST = \
diff --git a/legacy/embryo/src/lib/Makefile.am b/legacy/embryo/src/lib/Makefile.am
index f5c78aa111..d2ccb5585b 100644
--- a/legacy/embryo/src/lib/Makefile.am
+++ b/legacy/embryo/src/lib/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
13@EVIL_CFLAGS@ \ 13@EVIL_CFLAGS@ \
14@EXOTIC_CFLAGS@ \
14@EMBRYO_CPPFLAGS@ \ 15@EMBRYO_CPPFLAGS@ \
15@EFL_EMBRYO_BUILD@ 16@EFL_EMBRYO_BUILD@
16 17
@@ -29,7 +30,7 @@ embryo_str.c \
29embryo_time.c 30embryo_time.c
30 31
31libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ 32libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
32libembryo_la_LIBADD = @EVIL_LIBS@ -lm 33libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
33libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 34libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
34 35
35EXTRA_DIST = embryo_private.h 36EXTRA_DIST = embryo_private.h