[libepc] examples: Fix linker problems.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libepc] examples: Fix linker problems.
- Date: Wed, 12 Oct 2011 16:11:21 +0000 (UTC)
commit c826db96497934bb8eb4cfd49568def07e1cf08b
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 12 18:11:04 2011 +0200
examples: Fix linker problems.
* Makefile.am: Some examples used GTK+ but didn't link to it.
USe LIBEPC_UI_LIBS for these.
ChangeLog | 7 +++++++
Makefile.am | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 857feb2..e822985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-12 Murray Cumming <murrayc murrayc com>
+
+ examples: Fix linker problems.
+
+ * Makefile.am: Some examples used GTK+ but didn't link to it.
+ USe LIBEPC_UI_LIBS for these.
+
2011-08-31 Ionut Biru <ibiru archlinux org>
Avoid use of deprecated G_CONST_RETURN
diff --git a/Makefile.am b/Makefile.am
index c4fb9d3..e0fba2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,11 +151,11 @@ examples_simple_publisher_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
examples_simple_publisher_LDADD = libepc/libepc-1.0.la $(LIBEPC_LIBS)
examples_consumer_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS)
-examples_consumer_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS)
+examples_consumer_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) $(LIBEPC_UI_LIBS)
examples_publisher_ui_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS) $(AVAHI_UI_CFLAGS) -rdynamic
-examples_publisher_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS)
+examples_publisher_ui_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(AVAHI_UI_LIBS) $(LIBEPC_LIBS) $(LIBEPC_UI_LIBS)
examples_server_credentials_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS)
-examples_server_credentials_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(LIBEPC_LIBS)
+examples_server_credentials_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la $(LIBEPC_LIBS) $(LIBEPC_UI_LIBS)
tests_libepc_tests_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
@@ -180,7 +180,7 @@ tests_test_dispatcher_unique_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la
tests_test_expand_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
tests_test_expand_name_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS)
tests_test_progress_hooks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) $(LIBEPC_UI_CFLAGS)
-tests_test_progress_hooks_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS)
+tests_test_progress_hooks_LDADD = libepc/libepc-1.0.la libepc-ui/libepc-ui-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS) $(LIBEPC_UI_LIBS)
tests_test_publisher_bookmarks_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
tests_test_publisher_bookmarks_LDADD = libepc/libepc-1.0.la tests/libepc-tests.la $(LIBEPC_LIBS)
tests_test_publisher_change_name_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]