From 6aca4db89a6fbaecdeb3db67d375d1844cf57545 Mon Sep 17 00:00:00 2001 From: cedric Date: Fri, 24 Feb 2012 15:22:11 +0000 Subject: [PATCH 1/1] embryo: try to handle _LIBS appropriatly. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/embryo@68419 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 2 -- src/bin/Makefile.am | 3 ++- src/lib/Makefile.am | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index df343fa..1ff8b4d 100644 --- a/configure.ac +++ b/configure.ac @@ -118,8 +118,6 @@ PKG_CHECK_MODULES([EXOTIC], if test "x${enable_exotic}" = "xyes"; then requirement_embryo="exotic ${requirement_embryo}" - EINA_CFLAGS="${EINA_CFLAGS} ${EXOTIC_CFLAGS}" - EINA_LIBS="${EXOTIC_LIBS}" AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.]) fi diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 09f6ffd..e5e670c 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EINA_CFLAGS@ \ +@EMBRYO_CFLAGS@ \ @EVIL_CFLAGS@ bin_PROGRAMS = @EMBRYO_CC_PRG@ @@ -32,7 +33,7 @@ embryo_cc_prefix.c \ embryo_cc_prefix.h embryo_cc_CFLAGS = @EMBRYO_CFLAGS@ -embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_LIBS@ -lm +embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EMBRYO_LIBS@ @EINA_LIBS@ -lm embryo_cc_LDFLAGS = @lt_enable_auto_import@ EXTRA_DIST = \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f5c78aa..d2ccb55 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EVIL_CFLAGS@ \ +@EXOTIC_CFLAGS@ \ @EMBRYO_CPPFLAGS@ \ @EFL_EMBRYO_BUILD@ @@ -29,7 +30,7 @@ embryo_str.c \ embryo_time.c libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ -libembryo_la_LIBADD = @EVIL_LIBS@ -lm +libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = embryo_private.h -- 2.7.4