Menu
▾
▴
E SVN: cedric IN trunk/esmart: . src/bin src/lib/esmart_cairo src/lib/esmart_container src/lib/esmart_draggies src/lib/esmart_file_dialog src/lib/esmart_resize src/lib/esmart_text_entry src/lib/esmart_thumb src/lib/esmart_trans_x11
|
From: Enlightenment S. <no-...@en...> - 2008-10-14 15:37:36
|
Log:
Better fix for linking/compiling with Eina.
Author: cedric
Date: 2008-10-14 08:37:29 -0700 (Tue, 14 Oct 2008)
New Revision: 36659
Modified:
trunk/esmart/configure.ac trunk/esmart/src/bin/Makefile.am trunk/esmart/src/lib/esmart_cairo/Makefile.am trunk/esmart/src/lib/esmart_container/Makefile.am trunk/esmart/src/lib/esmart_draggies/Makefile.am trunk/esmart/src/lib/esmart_file_dialog/Makefile.am trunk/esmart/src/lib/esmart_resize/Makefile.am trunk/esmart/src/lib/esmart_text_entry/Makefile.am trunk/esmart/src/lib/esmart_thumb/Makefile.am trunk/esmart/src/lib/esmart_trans_x11/Makefile.am
Modified: trunk/esmart/configure.ac
===================================================================
--- trunk/esmart/configure.ac 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/configure.ac 2008-10-14 15:37:29 UTC (rev 36659)
@@ -36,16 +36,15 @@
# evas is required by all of the modules anyway :)
requirements="evas"
-PKG_CHECK_MODULES(CONTAINER, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9])
+PKG_CHECK_MODULES(CONTAINER, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 eina-0])
AC_CHECK_HEADER(ltdl.h, have_esmart_container=yes, have_esmart_container=no)
-PKG_CHECK_MODULES([EINA], [eina-0])
-
PKG_CHECK_MODULES(DRAGGIES, [
evas >= 0.9.9
ecore-x >= 0.9.9
ecore-evas >= 0.9.9
+ eina-0
], [
have_esmart_draggies=yes
requirements="$requirements ecore-evas"
@@ -58,6 +57,7 @@
evas >= 0.9.9
ecore-x >= 0.9.9
ecore-evas >= 0.9.9
+ eina-0
], [
have_esmart_resize=yes
requirements="$requirements ecore-evas"
@@ -70,6 +70,7 @@
evas >= 0.9.9
ecore-x >= 0.9.9
imlib2 >= 1.0.0
+ eina-0
], [
have_esmart_trans_x11=yes
requirements="$requirements ecore-x imlib2"
@@ -82,6 +83,7 @@
evas >= 0.9.9
imlib2 >= 1.0.0
epsilon >= 0.3.0
+ eina-0
], [
have_esmart_thumb=yes
requirements="$requirements imlib2 epsilon"
@@ -95,6 +97,7 @@
ecore >= 0.9.9
ecore-evas >= 0.9.9
edje >= 0.9.9
+ eina-0
], [
have_esmart_text_entry=yes
requirements="$requirements edje"
@@ -106,6 +109,7 @@
PKG_CHECK_MODULES(FILE_DIALOG, [
evas >= 0.9.9
edje >= 0.5.0
+ eina-0
], [
have_esmart_file_dialog=yes
requirements="$requirements edje"
@@ -117,6 +121,7 @@
PKG_CHECK_MODULES(CAIRO, [
cairo >= 1.6.4
evas >= 0.9.9
+ eina-0
], [
PKG_CHECK_MODULES(CAIRO_TEST, [
cairo >= 1.6.4
Modified: trunk/esmart/src/bin/Makefile.am
===================================================================
--- trunk/esmart/src/bin/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/bin/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -11,7 +11,6 @@
-I$(top_srcdir)/src/lib/esmart_file_dialog \
-I$(top_srcdir)/src/lib/esmart_cairo \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CFLAGS@ \
@CONTAINER_CFLAGS@ \
@THUMB_CFLAGS@
@@ -26,7 +25,6 @@
$(top_builddir)/src/lib/esmart_thumb/libesmart_thumb.la \
$(top_builddir)/src/lib/esmart_trans_x11/libesmart_trans_x11.la \
@CONTAINER_LIBS@ \
-@EINA_LIBS@ \
@THUMB_LIBS@
esmart_text_entry_test_SOURCES = esmart_text_entry_test.c
@@ -34,12 +32,12 @@
esmart_text_entry_test_LDADD = \
$(top_builddir)/src/lib/esmart_text_entry/libesmart_text_entry.la \
$(top_builddir)/src/lib/esmart_container/libesmart_container.la \
-@TEXT_ENTRY_LIBS@ @EINA_LIBS@
+@TEXT_ENTRY_LIBS@
if BUILD_ESMART_CAIRO
bin_PROGRAMS += esmart_cairo_test
esmart_cairo_test_SOURCES = esmart_cairo_test.c
-esmart_cairo_test_LDADD = @CAIRO_TEST_LIBS@ @EINA_LIBS@ \
+esmart_cairo_test_LDADD = @CAIRO_TEST_LIBS@ \
$(top_builddir)/src/lib/esmart_cairo/libesmart_cairo.la
-esmart_cairo_test_CPPFLAGS = $(AM_CPPFLAGS) @CAIRO_TEST_CFLAGS@ @EINA_CFLAGS@
+esmart_cairo_test_CPPFLAGS = $(AM_CPPFLAGS) @CAIRO_TEST_CFLAGS@
endif
Modified: trunk/esmart/src/lib/esmart_cairo/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_cairo/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_cairo/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_cairo \
-@CAIRO_CFLAGS@ @EINA_CFLAGS@
+@CAIRO_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_cairo.la
@@ -15,4 +15,4 @@
Esmart_Cairo.h
libesmart_cairo_la_LDFLAGS = -version-info @version_info@
-libesmart_cairo_la_LIBADD = @CAIRO_LIBS@ @EINA_LIBS@
+libesmart_cairo_la_LIBADD = @CAIRO_LIBS@
Modified: trunk/esmart/src/lib/esmart_container/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_container/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_container/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -6,7 +6,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_container \
-DCONTAINER_PLUGIN_DIR=\"$(libdir)/$(PACKAGE)/layout\" \
-@CONTAINER_CFLAGS@ @EINA_CFLAGS@
+@CONTAINER_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_container.la
@@ -24,4 +24,4 @@
esmart_container_util.c
libesmart_container_la_LDFLAGS = -no-undefined -version-info @version_info@
-libesmart_container_la_LIBADD = @EINA_LIBS@ @CONTAINER_LIBS@ -lltdl -lm
+libesmart_container_la_LIBADD = @CONTAINER_LIBS@ -lltdl -lm
Modified: trunk/esmart/src/lib/esmart_draggies/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_draggies/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_draggies/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_draggies \
-@DRAGGIES_CFLAGS@ @EINA_CFLAGS@
+@DRAGGIES_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_draggies.la
@@ -16,4 +16,4 @@
Esmart_Draggies.h
libesmart_draggies_la_LDFLAGS = -version-info @version_info@
-libesmart_draggies_la_LIBADD = @DRAGGIES_LIBS@ @EINA_LIBS@
+libesmart_draggies_la_LIBADD = @DRAGGIES_LIBS@
Modified: trunk/esmart/src/lib/esmart_file_dialog/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_file_dialog/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_file_dialog/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_dialog \
-@FILE_DIALOG_CFLAGS@ @EINA_CFLAGS@
+@FILE_DIALOG_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_file_dialog.la
@@ -23,4 +23,4 @@
libesmart_file_dialog_la_LIBADD = \
$(top_builddir)/src/lib/esmart_container/libesmart_container.la \
$(top_builddir)/src/lib/esmart_text_entry/libesmart_text_entry.la \
-@FILE_DIALOG_LIBS@ @EINA_LIBS@
+@FILE_DIALOG_LIBS@
Modified: trunk/esmart/src/lib/esmart_resize/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_resize/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_resize/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_resize \
-@RESIZE_CFLAGS@ @EINA_CFLAGS@
+@RESIZE_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_resize.la
@@ -16,4 +16,4 @@
Esmart_Resize.h
libesmart_resize_la_LDFLAGS = -version-info @version_info@
-libesmart_resize_la_LIBADD = @RESIZE_LIBS@ @EINA_CFLAGS@
+libesmart_resize_la_LIBADD = @RESIZE_LIBS@
Modified: trunk/esmart/src/lib/esmart_text_entry/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_text_entry/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_text_entry/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_text_entry \
-@TEXT_ENTRY_CFLAGS@ @EINA_CFLAGS@
+@TEXT_ENTRY_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_text_entry.la
@@ -16,5 +16,5 @@
Esmart_Text_Entry.h
libesmart_text_entry_la_LDFLAGS = -no-undefined -version-info @version_info@
-libesmart_text_entry_la_LIBADD = @EINA_LIBS@ @TEXT_ENTRY_LIBS@
+libesmart_text_entry_la_LIBADD = @TEXT_ENTRY_LIBS@
Modified: trunk/esmart/src/lib/esmart_thumb/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_thumb/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_thumb/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
INCLUDES = \
-I$(top_srcdir)/src/lib/esmart_thumb \
-@THUMB_CFLAGS@ @EINA_CFLAGS@
+@THUMB_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_thumb.la
@@ -16,4 +16,4 @@
Esmart_Thumb.h
libesmart_thumb_la_LDFLAGS = -version-info @version_info@
-libesmart_thumb_la_LIBADD = @THUMB_LIBS@ @EINA_LIBS@
+libesmart_thumb_la_LIBADD = @THUMB_LIBS@
Modified: trunk/esmart/src/lib/esmart_trans_x11/Makefile.am
===================================================================
--- trunk/esmart/src/lib/esmart_trans_x11/Makefile.am 2008-10-14 15:32:57 UTC (rev 36658)
+++ trunk/esmart/src/lib/esmart_trans_x11/Makefile.am 2008-10-14 15:37:29 UTC (rev 36659)
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/esmart_trans_x11 \
-@TRANSX11_CFLAGS@ @EINA_CFLAGS@
+@TRANSX11_CFLAGS@
pkgdir = @libdir@
pkg_LTLIBRARIES = libesmart_trans_x11.la
@@ -16,4 +16,4 @@
Esmart_Trans_X11.h
libesmart_trans_x11_la_LDFLAGS = -version-info @version_info@
-libesmart_trans_x11_la_LIBADD = @EINA_LIBS@ @TRANSX11_LIBS@ -L/usr/X11R6/lib
+libesmart_trans_x11_la_LIBADD = @TRANSX11_LIBS@ -L/usr/X11R6/lib
|