From a106e8d3b60167cb0c1b38d28fff93cff90d89ec Mon Sep 17 00:00:00 2001 From: Ted Gould 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(-) 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 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(-) 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 9366eb01ebca988dc646683e1091f10240009a99 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 17:20:56 -0500 Subject: Bringing along the AssemblyInfo.cs file and fixing its path --- bindings/mono/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index e573c9b..7e2b0d2 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -19,6 +19,7 @@ DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom EXTRA_DIST = \ + AssemblyInfo.cs \ $(RAW_API) \ $(METADATA) \ appindicator-sharp-0.1.pc.in \ @@ -74,9 +75,9 @@ generated-stamp: $(API) $(build_customs) --outdir=generated --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): generated-stamp +$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs + $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ -- cgit v1.2.3 From 6efcf99c34c7a3d6025aaa116f8ca95df6618f87 Mon Sep 17 00:00:00 2001 From: Ted Gould 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(-) 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 From 29a3d0294617ba290d06679013960010b0e8c4bb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 20:17:07 -0500 Subject: Ignoring the lru file header --- docs/reference/Makefile.am | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 3aedd60..df0ac09 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -55,7 +55,21 @@ CFILE_GLOB=$(top_srcdir)/src/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=app-indicator-enum-types.h application-service-appstore.h application-service-client.h application-service-marshal.h application-service-server.h application-service-watcher.h dbus-properties-client.h dbus-properties-server.h dbus-shared.h notification-item-client.h notification-item-server.h notification-watcher-client.h notification-watcher-server.h +IGNORE_HFILES= \ + app-indicator-enum-types.h \ + application-service-appstore.h \ + application-service-client.h \ + application-service-lru-file.h \ + application-service-marshal.h \ + application-service-server.h \ + application-service-watcher.h \ + dbus-properties-client.h \ + dbus-properties-server.h \ + dbus-shared.h \ + notification-item-client.h \ + notification-item-server.h \ + notification-watcher-client.h \ + notification-watcher-server.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -- cgit v1.2.3 From 20a976b8a356aec5c36fe44493f9f51987e932ac Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 20:22:24 -0500 Subject: Only grab the app indicator files. --- docs/reference/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index df0ac09..10d8b2a 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -50,8 +50,8 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/src/*.h -CFILE_GLOB=$(top_srcdir)/src/*.c +HFILE_GLOB=$(top_srcdir)/src/app-indicator*.h +CFILE_GLOB=$(top_srcdir)/src/app-indicator*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -- cgit v1.2.3