Fixes for gcc 4.5

Change-Id: I8a7ad16886ae27d10783f50903940cb120dec6fb

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 22511df..6e0c740 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -83,18 +83,32 @@ test_calendar.c \
 test_diskselector.c \
 test_ctxpopup.c 
 
-elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_test_LDFLAGS =
 
 elementary_config_SOURCES = \
 config.c
 
-elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_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_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_quicklaunch_LDFLAGS =
 
 if BUILD_RUN
@@ -115,7 +129,12 @@ elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
 elementary_testql_la_CFLAGS =
 elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
 elementary_testql_SOURCES = $(elementary_test_SOURCES)
-elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la
+elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =
 endif