From 1a80e60baf548087be31fae206ff7401c673f7a9 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 7 Aug 2006 20:26:33 +0000 Subject: [PATCH] add lib deps back in - seemingly i found a modern gcc/ld that doesnt seem to handle shared lib deps... weird. SVN revision: 24445 --- legacy/ecore/configure.in | 2 +- legacy/ecore/ecore-config.in | 20 ++++++++++---------- legacy/edje/edje-config.in | 2 +- legacy/evas/evas-config.in | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index efeca50867..9fe627b83a 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -203,7 +203,7 @@ if test "x$want_ecore_x" = "xyes"; then x_dir=${x_dir:-/usr/X11R6} x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - ecore_x_libs="-lecore_x"; + ecore_x_libs="-lecore_x $x_libs"; ],[ AM_CONDITIONAL(BUILD_ECORE_X, false) ] diff --git a/legacy/ecore/ecore-config.in b/legacy/ecore/ecore-config.in index 2b941d0765..9e0dfd9525 100644 --- a/legacy/ecore/ecore-config.in +++ b/legacy/ecore/ecore-config.in @@ -49,35 +49,35 @@ while test $# -gt 0; do ;; --libs) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ @ecore_file_libs@ @ecore_dbus_libs@ @EET_LIBS@ -lm + echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ @ecore_file_libs@ @ecore_dbus_libs@ @SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ @EET_LIBS@ @EVAS_LIBS@ @x_libs@ @Xcursor_libs@ @Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@ @Xfixes_libs@ @Xdamage_libs@ @Xss_libs@ @iconv_libs@ @tslib_libs@ @fam_libs@ -lm ;; --libs-con) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_con_libs@ -lm + echo $libdirs -lecore @ecore_con_libs@ @SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ -lm ;; --libs-config) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_config_libs@ @EET_LIBS@ -lm + echo $libdirs -lecore @ecore_config_libs@ @EET_LIBS@ @EVAS_LIBS@ -lm ;; --libs-dbus) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_dbus_libs@ -lm + echo $libdirs -lecore @ecore_dbus_libs@ @SSL_LIBS@ -lm ;; --libs-evas) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_evas_libs@ -lm + echo $libdirs -lecore @ecore_evas_libs@ @EVAS_LIBS@ @ecore_x_libs@ @x_libs@ @Xcursor_libs@ @Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@ @Xfixes_libs@ @Xdamage_libs@ @Xss_libs@ @ecore_txt_libs@ @iconv_libs@ @ecore_job_libs@ @ecore_fb_libs@ @tslib_libs@ -lm ;; --libs-fb) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_fb_libs@ -lm + echo $libdirs -lecore @ecore_fb_libs@ @tslib_libs@ -lm ;; --libs-file) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_file_libs@ -lm + echo $libdirs -lecore @ecore_file_libs@ @fam_libs@ @CURL_LIBS@ -lm ;; --libs-ipc) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_ipc_libs@ -lm + echo $libdirs -lecore @ecore_ipc_libs@ @ecore_con_libs@ @SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ -lm ;; --libs-job) libdirs=-L@libdir@ @@ -85,11 +85,11 @@ while test $# -gt 0; do ;; --libs-txt) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_txt_libs@ -lm + echo $libdirs -lecore @ecore_txt_libs@ @iconv_libs@ -lm ;; --libs-x) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_x_libs@ -lm + echo $libdirs -lecore @ecore_x_libs@ @x_libs@ @Xcursor_libs@ @Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@ @Xfixes_libs@ @Xdamage_libs@ @Xss_libs@ @ecore_txt_libs@ @iconv_libs@ @ecore_job_libs@ -lm ;; *) usage diff --git a/legacy/edje/edje-config.in b/legacy/edje/edje-config.in index 40c9e13e26..ceb8987ec9 100644 --- a/legacy/edje/edje-config.in +++ b/legacy/edje/edje-config.in @@ -46,7 +46,7 @@ while test $# -gt 0; do ;; --libs) libdirs=-L@libdir@ - echo $libdirs -ledje + echo $libdirs -ledje @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@ -lm ;; --datadir) echo @prefix@/share/edje diff --git a/legacy/evas/evas-config.in b/legacy/evas/evas-config.in index 7e4064832e..6c099a2965 100644 --- a/legacy/evas/evas-config.in +++ b/legacy/evas/evas-config.in @@ -46,7 +46,7 @@ while test $# -gt 0; do ;; --libs) libdirs=-L@libdir@ - echo $libdirs -levas + echo $libdirs -levas @dlopen_libs@ @eet_libs@ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ ;; *) echo "${usage}" 1>&2