Fix embryo, i.e. add eina CFLAGS and LDFLAGS.
authorptomaine <ptomaine@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 20 Oct 2008 18:47:00 +0000 (18:47 +0000)
committerptomaine <ptomaine@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 20 Oct 2008 18:47:00 +0000 (18:47 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/embryo@36869 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

configure.ac
src/bin/Makefile.am
src/lib/Makefile.am

index 4a54a76..f83040e 100644 (file)
@@ -30,6 +30,8 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
 version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
 AC_SUBST(version_info)
 
+PKG_CHECK_MODULES([EINA], [eina-0])
+
 WIN32_CFLAGS=""
 lt_no_undefined=""
 lt_enable_auto_import=""
index e26d109..d7bf54d 100644 (file)
@@ -9,7 +9,8 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVIL_CFLAGS@
+@EVIL_CFLAGS@ \
+@EINA_CFLAGS@
 
 bin_PROGRAMS = embryo_cc
 
@@ -31,7 +32,7 @@ embryo_cc_prefix.c \
 embryo_cc_prefix.h
 
 embryo_cc_CFLAGS = @WIN32_CFLAGS@
-embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ -lm
+embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_CFLAGS@ -lm
 embryo_cc_LDFLAGS = @lt_enable_auto_import@
 embryo_cc_DEPENDENCIES = $(top_builddir)/src/lib/libembryo.la
 
index 9b94e2c..87b1c75 100644 (file)
@@ -9,7 +9,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EINA_CFLAGS@
 
 include_HEADERS = Embryo.h
 
@@ -25,7 +26,7 @@ embryo_str.c \
 embryo_time.c
 
 libembryo_la_CFLAGS = @WIN32_CFLAGS@
-libembryo_la_LIBADD = -lm @fnmatch_libs@
+libembryo_la_LIBADD = -lm @fnmatch_libs@ @EINA_LIBS@
 libembryo_la_DEPENDENCIES = $(top_builddir)/config.h
 libembryo_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@