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