From c5e62b64e1b8bc31266b426ccb1975300d365bc2 Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Mon, 9 Jan 2012 12:04:59 +0000
Subject: use notdir when generating the .gir to allow out-of-tree builds

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

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 254022e..a044528 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,13 +65,13 @@ libindicator_datetime_la_LDFLAGS = -module -avoid-version
 
 gen-%.xml.c: %.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
 BUILT_SOURCES = \
 	gen-datetime-service.xml.c \
-- 
cgit v1.2.3


From 49965d030fd65d3607ea0b611545163d45019852 Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Mon, 9 Jan 2012 12:09:20 +0000
Subject: use libtimezonemap

---
 src/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index a044528..e324117 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,12 +54,10 @@ libindicator_datetime_la_SOURCES =\
 libindicator_datetime_la_CFLAGS = \
 	-Wall \
 	-Werror \
-	-I$(top_srcdir)/libmap \
 	$(PREF_CFLAGS) \
 	-DTIMEZONE_FILE="\"/etc/timezone\"" \
 	-DPKGDATADIR="\"$(pkgdatadir)\""
 libindicator_datetime_la_LIBADD = \
-	 $(top_builddir)/libmap/libmap.la \
 	$(PREF_LIBS)
 libindicator_datetime_la_LDFLAGS = -module -avoid-version
 
-- 
cgit v1.2.3


From fe58c7854934c37a765b7c50721c4a7e7bda5aab Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Mon, 9 Jan 2012 14:06:50 +0100
Subject: and move TimezoneCompletion to libtimezonemap too

---
 src/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index e324117..328f279 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,8 +46,6 @@ libindicator_datetime_la_SOURCES =\
 	datetime-prefs.c \
 	datetime-prefs-locations.c \
 	datetime-prefs-locations.h \
-	timezone-completion.c \
-	timezone-completion.h \
 	utils.c \
 	utils.h \
 	settings-shared.h
-- 
cgit v1.2.3