From d94f22ad592b9f50898c26f06f7750ab4df686cf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 3 Aug 2009 23:49:42 +0100 Subject: Fixing these guys to include the -gtk library where needed --- examples/Makefile.am | 14 ++++++++++---- examples/im-client.c | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/Makefile.am b/examples/Makefile.am index 862046e..d6b74c6 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -33,22 +33,28 @@ listen_and_print_SOURCES = \ listen_and_print_CFLAGS = \ -I $(srcdir)/.. \ - $(LIBINDICATE_CFLAGS) + $(LIBINDICATE_CFLAGS) \ + $(LIBINDICATEGTK_CFLAGS) listen_and_print_LDADD = \ ../libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) + ../libindicate-gtk/libindicate-gtk.la \ + $(LIBINDICATE_LIBS) \ + $(LIBINDICATEGTK_LIBS) im_client_SOURCES = \ im-client.c im_client_CFLAGS = \ -I $(srcdir)/.. \ - $(LIBINDICATE_CFLAGS) + $(LIBINDICATE_CFLAGS) \ + $(LIBINDICATEGTK_CFLAGS) im_client_LDADD = \ ../libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) + ../libindicate-gtk/libindicate-gtk.la \ + $(LIBINDICATE_LIBS) \ + $(LIBINDICATEGTK_LIBS) show_hide_server_SOURCES = \ show-hide-server.c diff --git a/examples/im-client.c b/examples/im-client.c index bf2fbb2..502484d 100644 --- a/examples/im-client.c +++ b/examples/im-client.c @@ -22,6 +22,7 @@ with this program. If not, see . #include #include "libindicate/server.h" #include "libindicate/indicator-message.h" +#include "libindicate-gtk/indicator.h" gchar * patha = "/usr/share/icons/hicolor/16x16/apps/empathy.png"; gchar * pathb = "/usr/share/icons/hicolor/22x22/apps/empathy.png"; -- cgit v1.2.3 From 8850baa192b65b5b9b4985cab9a08aacb5fed9d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 00:01:06 +0100 Subject: A bunch of distcheck fixes to clean things up --- configure.ac | 3 ++- examples/listen-and-print.c | 1 + libindicate-gtk/Makefile.am | 1 + src/Makefile.am | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/configure.ac b/configure.ac index 3e65f25..914abb3 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,8 @@ GDK_PIXBUF_REQUIRED_VERSION=2.12 PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION) + gtk+-2.0 >= $GTK_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) AC_SUBST(LIBINDICATEGTK_CFLAGS) AC_SUBST(LIBINDICATEGTK_LIBS) diff --git a/examples/listen-and-print.c b/examples/listen-and-print.c index dcad92b..57cb7be 100644 --- a/examples/listen-and-print.c +++ b/examples/listen-and-print.c @@ -21,6 +21,7 @@ with this program. If not, see . #include #include "libindicate/listener.h" +#include "libindicate-gtk/listener.h" static void show_property_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data) diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am index 6112b5f..d25cee3 100644 --- a/libindicate-gtk/Makefile.am +++ b/libindicate-gtk/Makefile.am @@ -28,6 +28,7 @@ libindicate_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_d].*" libindicate_gtk_la_CFLAGS = \ + -I $(srcdir)/.. \ $(LIBINDICATEGTK_CFLAGS) libindicate_gtk_la_LIBADD = \ diff --git a/src/Makefile.am b/src/Makefile.am index 02b70c1..97af739 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ indicator_applet_CFLAGS = \ -DG_LOG_DOMAIN=\""Indicator-Applet"\" \ -DDATADIR=\""$(datadir)"\" \ -DINDICATOR_DIR=\""$(libdir)/indicators/2"\" \ + -I$(srcdir)/.. \ $(APPLET_CFLAGS) indicator_applet_SOURCES = \ -- cgit v1.2.3