From ba1fd3904b920d017b532a0e1ff2ba4941cdb47d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Apr 2010 11:31:36 -0500 Subject: Removing the libappindicator directory to make things simpler --- src/Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9f2771e..d8599d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ CLEANFILES = DISTCLEANFILES = BUILT_SOURCES = -EXTRA_DIST = libappindicator/appindicator-0.1.pc.in +EXTRA_DIST = appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal @@ -61,14 +61,14 @@ glib_marshal_prefix = _application_service_marshal # Library ################################## -pkgconfig_DATA = libappindicator/appindicator-0.1.pc +pkgconfig_DATA = appindicator-0.1.pc pkgconfigdir = $(libdir)/pkgconfig -glib_enum_h = libappindicator/app-indicator-enum-types.h -glib_enum_c = libappindicator/app-indicator-enum-types.gen.c +glib_enum_h = app-indicator-enum-types.h +glib_enum_c = app-indicator-enum-types.gen.c glib_enum_headers = $(libappindicator_headers) -libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-types.gen.c +app-indicator-enum-types.c: app-indicator-enum-types.gen.c sed -e "s|\"passive\"|\"Passive\"|" \ -e "s|\"active\"|\"Active\"|" \ -e "s|\"attention\"|\"NeedsAttention\"|" \ @@ -78,7 +78,7 @@ libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-t -e "s|\"hardware\"|\"Hardware\"|" \ -e "s|\"other\"|\"Other\"|" \ $< > $@ -DISTCLEANFILES += libappindicator/app-indicator-enum-types.c +DISTCLEANFILES += app-indicator-enum-types.c lib_LTLIBRARIES = \ libappindicator.la @@ -86,7 +86,7 @@ lib_LTLIBRARIES = \ libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator libappindicator_headers = \ - $(srcdir)/libappindicator/app-indicator.h + $(srcdir)/app-indicator.h libappindicatorinclude_HEADERS = \ $(libappindicator_headers) \ @@ -94,10 +94,10 @@ libappindicatorinclude_HEADERS = \ libappindicator_la_SOURCES = \ $(libappindicator_headers) \ - libappindicator/app-indicator-enum-types.c \ + app-indicator-enum-types.c \ notification-watcher-client.h \ notification-item-server.h \ - libappindicator/app-indicator.c + app-indicator.c libappindicator_la_LDFLAGS = \ -version-info 0:0:0 \ -- cgit v1.2.3 From 3ef5fec331863cb0f079a109cd1eaa0410c40b09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Apr 2010 11:54:42 -0500 Subject: Building the GIR file --- src/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index d8599d8..a1d018b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -142,3 +142,37 @@ BUILT_SOURCES += \ CLEANFILES += $(BUILT_SOURCES) EXTRA_DIST += $(DBUS_SPECS) + +######################### +# GObject Introsepction +######################### + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) + +if HAVE_INTROSPECTION + +introspection_sources = $(libappindicatorinclude_HEADERS) + +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_LIBS = libappindicator.la +AppIndicator_0_1_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + +INTROSPECTION_GIRS += AppIndicator-0.1.gir + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) + +endif + -- cgit v1.2.3 From fae0a61f431325f1f9023026368ec27cb5b2b01a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Apr 2010 12:07:21 -0500 Subject: Now, build us a VAPI! --- src/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a1d018b..c2bac63 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -176,3 +176,22 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA) endif +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = AppIndicator-0.1.vapi + +AppIndicator-0.1.vapi: AppIndicator-0.1.gir Makefile.am + $(VALA_API_GEN) --library=AppIndicator-0.1 \ + --pkg gtk+-2.0 \ + --vapidir=$(top_builddir)/src \ + $< + +CLEANFILES += $(vapi_DATA) + +endif + -- cgit v1.2.3 From 8f8efd3b3472e7f795d30eb0c3d91c153f10f5a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 14:46:24 -0500 Subject: Fix C includes fro teh VAPI/GIR files --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index c2bac63..28cd4c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,7 +86,7 @@ lib_LTLIBRARIES = \ libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator libappindicator_headers = \ - $(srcdir)/app-indicator.h + app-indicator.h libappindicatorinclude_HEADERS = \ $(libappindicator_headers) \ @@ -149,7 +149,9 @@ EXTRA_DIST += $(DBUS_SPECS) -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_SCANNER_ARGS = \ + --add-include-path=$(srcdir) \ + $(addprefix --c-include=libappindicator/, $(introspection_sources)) INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION -- cgit v1.2.3 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(-) (limited to 'src/Makefile.am') 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(-) (limited to 'src/Makefile.am') 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 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/Makefile.am') 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 01fafa492912486a291d70d2289ba4d77355be92 Mon Sep 17 00:00:00 2001 From: Sense Hofstede Date: Sun, 23 May 2010 12:44:53 +0200 Subject: Documentation and introspection fixes and such * Several documentation and introspection fixes * Some small fixes to the mono bindings --- src/Makefile.am | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index c2bac63..a5c47e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,8 @@ indicator_application_service_CFLAGS = \ -Wall -Werror \ -DG_LOG_DOMAIN=\"indicator-application-service\" indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) + $(INDICATOR_LIBS) \ + libappindicator.la glib_marshal_list = application-service-marshal.list glib_marshal_prefix = _application_service_marshal @@ -65,19 +66,9 @@ pkgconfig_DATA = appindicator-0.1.pc pkgconfigdir = $(libdir)/pkgconfig glib_enum_h = app-indicator-enum-types.h -glib_enum_c = app-indicator-enum-types.gen.c +glib_enum_c = app-indicator-enum-types.c glib_enum_headers = $(libappindicator_headers) -app-indicator-enum-types.c: app-indicator-enum-types.gen.c - sed -e "s|\"passive\"|\"Passive\"|" \ - -e "s|\"active\"|\"Active\"|" \ - -e "s|\"attention\"|\"NeedsAttention\"|" \ - -e "s|\"application-status\"|\"ApplicationStatus\"|" \ - -e "s|\"communications\"|\"Communications\"|" \ - -e "s|\"system-services\"|\"SystemServices\"|" \ - -e "s|\"hardware\"|\"Hardware\"|" \ - -e "s|\"other\"|\"Other\"|" \ - $< > $@ DISTCLEANFILES += app-indicator-enum-types.c lib_LTLIBRARIES = \ -- cgit v1.2.3