DSO... ok link everything elm lib links and be done with it so we

donly have to do this in one place... and we do need a svn evas
(1.0.999+)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@57617 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 6e4762c..95d105f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@ PKG_CHECK_MODULES([ELEMENTARY],
    [
     eina >= 1.0.0
     eet >= 1.4.0
-    evas >= 1.0.0
+    evas >= 1.0.999
     ecore >= 1.0.0
     ecore-evas >= 1.0.0
     ecore-file >= 1.0.0
@@ -212,17 +212,6 @@ PKG_CHECK_MODULES([ELEMENTARY],
    ]
 )
 
-PKG_CHECK_MODULES([ELEMENTARY_BIN],
-   [
-    eina >= 1.0.0
-    edje >= 1.0.0
-    evas >= 1.0.0
-    ecore >= 1.0.0
-    ecore-file >= 1.0.0
-    ecore-evas >= 1.0.0
-   ]
-)
-
 requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
 
 have_elementary_x="no"

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1b8a582..bc68fdf 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -97,9 +97,10 @@ test_store.c
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
-       @ELEMENTARY_BIN_LIBS@ \
-       -lm
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_test_LDFLAGS =
 
 elementary_config_SOURCES = \
@@ -107,17 +108,19 @@ config.c
 
 elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
-       @ELEMENTARY_BIN_LIBS@
+       @ELEMENTARY_LIBS@
 elementary_config_LDFLAGS =
 
 if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
 elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
-       @ELEMENTARY_BIN_LIBS@ \
-       -lm
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_quicklaunch_LDFLAGS =
 
 if BUILD_RUN
@@ -142,7 +145,7 @@ elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
-       @ELEMENTARY_BIN_LIBS@ \
+       @ELEMENTARY_LIBS@ \
        @my_libs@
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =