From 89b31ab0083ef53a0372d5a3ab3b76a5f9d00d3b Mon Sep 17 00:00:00 2001
From: "Marco Trevisan (Treviño)" <mail@3v1n0.net>
Date: Fri, 4 Feb 2011 04:45:35 +0100
Subject: Examples, added simple-client-vala

A rewrite of the simple-client.c version in Vala as example.

Added a workaround for compiling it.
---
 example/Makefile.am | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'example/Makefile.am')

diff --git a/example/Makefile.am b/example/Makefile.am
index 0900baf..ae9ee94 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -4,9 +4,11 @@ else
 VER=
 endif
 
+CLEANFILES =
 
 check_PROGRAMS = \
-	simple-client
+	simple-client \
+	simple-client-vala
 
 #########################################
 ##  simple-client
@@ -27,3 +29,25 @@ simple_client_LDADD = \
 
 EXTRA_DIST = \
 	simple-client-test-icon.png
+
+#########################################
+##  simple-client-vala
+#########################################
+
+VALAFLAGS = \
+	--pkg appindicator$(VER)-0.1 \
+	--vapidir=$(top_builddir)/bindings/vala
+
+BUILT_SOURCES = simple-client-vala.c
+simple-client-vala.c: $(srcdir)/simple-client-vala.vala
+	$(VALAC) $(VALAFLAGS) -C $< -o $@
+	$(SED) -i "s|#include\s<libappindicator/app-indicator.h>||g" $@
+
+simple_client_vala_SOURCES = simple-client-vala.c
+simple_client_vala_CFLAGS = \
+	$(simple_client_CFLAGS) \
+	-include $(top_srcdir)/src/app-indicator.h
+
+simple_client_vala_LDADD = $(simple_client_LDADD)
+
+CLEANFILES += *.stamp *-vala.c
-- 
cgit v1.2.3


From 1b85f7f0fbfa233db1f68792e0496dc6b9d43164 Mon Sep 17 00:00:00 2001
From: "Marco Trevisan (Treviño)" <mail@3v1n0.net>
Date: Fri, 4 Feb 2011 12:36:25 +0100
Subject: Vala simple client, compile workaround improved.

---
 example/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'example/Makefile.am')

diff --git a/example/Makefile.am b/example/Makefile.am
index ae9ee94..62347d2 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -41,7 +41,7 @@ VALAFLAGS = \
 BUILT_SOURCES = simple-client-vala.c
 simple-client-vala.c: $(srcdir)/simple-client-vala.vala
 	$(VALAC) $(VALAFLAGS) -C $< -o $@
-	$(SED) -i "s|#include\s<libappindicator/app-indicator.h>||g" $@
+	$(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@
 
 simple_client_vala_SOURCES = simple-client-vala.c
 simple_client_vala_CFLAGS = \
-- 
cgit v1.2.3


From d268d2bd9de3cecc3c5cd69a048bc18e0b77b237 Mon Sep 17 00:00:00 2001
From: "Marco Trevisan (Treviño)" <mail@3v1n0.net>
Date: Sat, 5 Feb 2011 18:30:38 +0100
Subject: examples, vala: check for valac

---
 example/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'example/Makefile.am')

diff --git a/example/Makefile.am b/example/Makefile.am
index 62347d2..a3eb906 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -30,6 +30,8 @@ simple_client_LDADD = \
 EXTRA_DIST = \
 	simple-client-test-icon.png
 
+if HAVE_VALAC
+
 #########################################
 ##  simple-client-vala
 #########################################
@@ -51,3 +53,5 @@ simple_client_vala_CFLAGS = \
 simple_client_vala_LDADD = $(simple_client_LDADD)
 
 CLEANFILES += *.stamp *-vala.c
+
+endif
-- 
cgit v1.2.3


From b4f20fedc3d5e4549567c73e28cb22cff960eb79 Mon Sep 17 00:00:00 2001
From: "Marco Trevisan (Treviño)" <mail@3v1n0.net>
Date: Sat, 5 Feb 2011 18:31:44 +0100
Subject: example makefile code cleanup

---
 example/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'example/Makefile.am')

diff --git a/example/Makefile.am b/example/Makefile.am
index a3eb906..606317c 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -30,11 +30,10 @@ simple_client_LDADD = \
 EXTRA_DIST = \
 	simple-client-test-icon.png
 
-if HAVE_VALAC
-
 #########################################
 ##  simple-client-vala
 #########################################
+if HAVE_VALAC
 
 VALAFLAGS = \
 	--pkg appindicator$(VER)-0.1 \
-- 
cgit v1.2.3


From cd7daed5c4a5b1a60de025eff1f5dae2f03b56a3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 15:25:15 -0600
Subject: Make sure to pull the vala source file along with us.

---
 example/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'example/Makefile.am')

diff --git a/example/Makefile.am b/example/Makefile.am
index 606317c..dbea724 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -5,6 +5,7 @@ VER=
 endif
 
 CLEANFILES =
+EXTRA_DIST = 
 
 check_PROGRAMS = \
 	simple-client \
@@ -27,7 +28,7 @@ simple_client_LDADD = \
 	$(LIBRARY_LIBS) \
 	$(top_builddir)/src/libappindicator$(VER).la
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	simple-client-test-icon.png
 
 #########################################
@@ -54,3 +55,6 @@ simple_client_vala_LDADD = $(simple_client_LDADD)
 CLEANFILES += *.stamp *-vala.c
 
 endif
+
+EXTRA_DIST += \
+	simple-client-vala.vala
-- 
cgit v1.2.3