diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 20 | ||||
| -rw-r--r-- | tools/indicator-loader.c | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 8df5445..4aa3cfc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ if USE_GTK3 -INDICATOR_LIB = -lindicator3 -libexec_PROGRAMS = indicator-loader3 +INDICATOR_LIB = -layatana-indicator3 +libexec_PROGRAMS = ayatana-indicator-loader3 VER=3 endif @@ -9,29 +9,31 @@ endif # Indicator Loader ############################# -indicator_loader_SOURCES = \ +ayatana_indicator_loader_SOURCES = \ indicator-loader.c -indicator_loader_CFLAGS = \ +ayatana_indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ -DBUILD_DIR="\"$(builddir)\"" -indicator_loader_LDADD = \ +ayatana_indicator_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) # We duplicate these here because Automake won't let us use $(VER) on the left hand side. # Since we carefully use $(VER) in the right hand side above, we can assign the same values. # Only one version of the library is every compiled at the same time, so it is safe to reuse # the right hand sides like this. -indicator_loader3_SOURCES = $(indicator_loader_SOURCES) -indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) -indicator_loader3_LDADD = $(indicator_loader_LDADD) +ayatana_indicator_loader3_SOURCES = $(ayatana_indicator_loader_SOURCES) +ayatana_indicator_loader3_CFLAGS = $(ayatana_indicator_loader_CFLAGS) +ayatana_indicator_loader3_LDADD = $(ayatana_indicator_loader_LDADD) xsessiondir = $(pkgdatadir) xsession_DATA = 80indicator-debugging EXTRA_DIST = $(xsession_DATA) + +DISTCLEANFILES = Makefile.in diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index a734b8a..7c30a59 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -24,10 +24,10 @@ */ #include <gtk/gtk.h> -#include <libido/libido.h> -#include <libindicator/indicator-object.h> +#include <libayatana-ido/libayatana-ido.h> +#include <libayatana-indicator/indicator-object.h> #if GTK_CHECK_VERSION (3,0,0) - #include <libindicator/indicator-ng.h> + #include <libayatana-indicator/indicator-ng.h> #endif static GHashTable * entry_to_menu_item = NULL; |