From b0c8eb12c211d7e1009fd8c7be525fd73c603a6d Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 18:00:06 -0500
Subject: Build indicator-loader3

---
 tools/Makefile.am | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6c67491..287d34f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,11 +1,13 @@
 if USE_GTK3
 INDICATOR_LIB = -lindicator3
+libexec_PROGRAMS = indicator-loader3
+VER=3
 else
+VER=
 INDICATOR_LIB = -lindicator
+libexec_PROGRAMS = indicator-loader
 endif
 
-libexec_PROGRAMS = \
-	indicator-loader
 
 #############################
 # Indicator Loader
@@ -24,6 +26,14 @@ indicator_loader_LDADD = \
 	-L$(top_builddir)/libindicator/.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)
+
 xsessiondir = $(sysconfdir)/X11/Xsession.d
 
 xsession_DATA = 80indicator-debugging
-- 
cgit v1.2.3


From fbef9e6709b9203ec124277a3671dde66451253e Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 18:00:33 -0500
Subject: Use abs_srcdir to find template files

---
 libindicator/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index 39cb2b7..b6239e6 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal
 indicator-object-enum-types.h: s-enum-types-h
 	@true
 s-enum-types-h: $(indicator_headers)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template								\
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template								\
 		$(indicator_headers) ) >> tmp-indicator-object-enum-types.h											\
 	&& (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h )	\
 	&& rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
@@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers)
 indicator-object-enum-types.c: s-enum-types-c
 	@true
 s-enum-types-c: $(indicator_headers)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template								\
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template								\
 		$(indicator_headers) ) > tmp-indicator-object-enum-types.c											\
 	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
 	&& rm -f tmp-indicator-object-enum-types.c
-- 
cgit v1.2.3