From a106e8d3b60167cb0c1b38d28fff93cff90d89ec Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 15:36:59 -0500
Subject: Need to look for things in the source directory too!

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

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 28cd4c3..8cfd81f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,7 +162,7 @@ AppIndicator-0.1.gir: libappindicator.la
 AppIndicator_0_1_gir_INCLUDES = \
     GObject-2.0 \
     Gtk-2.0
-AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS)
+AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir)
 AppIndicator_0_1_gir_LIBS = libappindicator.la
 AppIndicator_0_1_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 
-- 
cgit v1.2.3


From a403884d2c45e23f3ddf6fa739677cf0759d8665 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 17:10:38 -0500
Subject: Okay, now everyone is in the right directory, I think.

---
 src/Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8cfd81f..c96bbed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 glib_enum_h = app-indicator-enum-types.h
 glib_enum_c = app-indicator-enum-types.gen.c
-glib_enum_headers = $(libappindicator_headers)
+glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
 
 app-indicator-enum-types.c: app-indicator-enum-types.gen.c
 	sed -e "s|\"passive\"|\"Passive\"|" \
@@ -156,15 +156,17 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 
-introspection_sources = $(libappindicatorinclude_HEADERS)
+introspection_sources = \
+	$(addprefix $(srcdir)/,$(libappindicator_headers)) \
+	$(addprefix $(top_builddir)/src/, $(glib_enum_h))
 
-AppIndicator-0.1.gir: libappindicator.la
+AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h)
 AppIndicator_0_1_gir_INCLUDES = \
     GObject-2.0 \
     Gtk-2.0
-AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir)
+AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
 AppIndicator_0_1_gir_LIBS = libappindicator.la
-AppIndicator_0_1_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+AppIndicator_0_1_gir_FILES = $(introspection_sources)
 
 INTROSPECTION_GIRS += AppIndicator-0.1.gir
 
-- 
cgit v1.2.3


From 6efcf99c34c7a3d6025aaa116f8ca95df6618f87 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 May 2010 17:32:25 -0500
Subject: Fixing which sources are marked as BUILT

---
 src/Makefile.am | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index c96bbed..19ce66d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,21 +32,24 @@ libapplication_la_LDFLAGS = -module -avoid-version
 
 libexec_PROGRAMS = indicator-application-service
 
+BUILT_SOURCES += \
+	application-service-server.h \
+	application-service-marshal.h \
+	application-service-marshal.c \
+	dbus-properties-client.h \
+	notification-item-client.h \
+	notification-watcher-server.h
+
 indicator_application_service_SOURCES = \
 	application-service.c \
 	application-service-appstore.h \
 	application-service-appstore.c \
 	application-service-lru-file.h \
 	application-service-lru-file.c \
-	application-service-marshal.h \
 	application-service-marshal.c \
-	application-service-server.h \
 	application-service-watcher.h \
 	application-service-watcher.c \
-	dbus-properties-client.h \
-	dbus-shared.h \
-	notification-item-client.h \
-	notification-watcher-server.h
+	dbus-shared.h
 indicator_application_service_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
 	-Wall -Werror \
@@ -92,11 +95,13 @@ libappindicatorinclude_HEADERS = \
 	$(libappindicator_headers) \
 	$(glib_enum_h)
 
+BUILT_SOURCES += \
+	notification-watcher-client.h \
+	notification-item-server.h
+
 libappindicator_la_SOURCES = \
 	$(libappindicator_headers) \
 	app-indicator-enum-types.c \
-	notification-watcher-client.h \
-	notification-item-server.h \
 	app-indicator.c
 
 libappindicator_la_LDFLAGS = \
@@ -117,6 +122,7 @@ libappindicator_la_LIBADD = \
 ##################################
 
 DBUS_SPECS = \
+	dbus-properties.xml \
 	application-service.xml \
 	notification-item.xml \
 	notification-watcher.xml
-- 
cgit v1.2.3