aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-20 14:39:17 -0500
committerTed Gould <ted@gould.cx>2010-05-20 14:39:17 -0500
commite09b4591cf46334934a233511b18d7706802bd35 (patch)
tree0f992ea5cd6b4f859927f298090386dea54f7018 /src
parentea79d7fd68a100704d2b1ff883497fef0ce8c3a2 (diff)
parent0b091646a8ecf62c36cde27a1d0e784a55e9a0c2 (diff)
downloadlibayatana-appindicator-e09b4591cf46334934a233511b18d7706802bd35.tar.gz
libayatana-appindicator-e09b4591cf46334934a233511b18d7706802bd35.tar.bz2
libayatana-appindicator-e09b4591cf46334934a233511b18d7706802bd35.zip
Adding GIR/VAPI support and flattening directories
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am71
-rw-r--r--src/app-indicator-enum-types.gen.c.in (renamed from src/libappindicator/app-indicator-enum-types.gen.c.in)2
-rw-r--r--src/app-indicator-enum-types.h.in (renamed from src/libappindicator/app-indicator-enum-types.h.in)0
-rw-r--r--src/app-indicator.c (renamed from src/libappindicator/app-indicator.c)4
-rw-r--r--src/app-indicator.h (renamed from src/libappindicator/app-indicator.h)0
-rw-r--r--src/appindicator-0.1.pc.in (renamed from src/libappindicator/appindicator-0.1.pc.in)0
6 files changed, 65 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f2771e..c2bac63 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 \
@@ -142,3 +142,56 @@ 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
+
+#########################
+# 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
+
diff --git a/src/libappindicator/app-indicator-enum-types.gen.c.in b/src/app-indicator-enum-types.gen.c.in
index 449f3fc..6a647b8 100644
--- a/src/libappindicator/app-indicator-enum-types.gen.c.in
+++ b/src/app-indicator-enum-types.gen.c.in
@@ -27,7 +27,7 @@ License version 3 and version 2.1 along with this program. If not, see
<http://www.gnu.org/licenses/>
*/
-#include "libappindicator/app-indicator-enum-types.h"
+#include "app-indicator-enum-types.h"
/*** END file-header ***/
diff --git a/src/libappindicator/app-indicator-enum-types.h.in b/src/app-indicator-enum-types.h.in
index da3bf98..da3bf98 100644
--- a/src/libappindicator/app-indicator-enum-types.h.in
+++ b/src/app-indicator-enum-types.h.in
diff --git a/src/libappindicator/app-indicator.c b/src/app-indicator.c
index f7e121b..282e4e6 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/app-indicator.c
@@ -35,8 +35,8 @@ License version 3 and version 2.1 along with this program. If not, see
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-gtk/client.h>
-#include "libappindicator/app-indicator.h"
-#include "libappindicator/app-indicator-enum-types.h"
+#include "app-indicator.h"
+#include "app-indicator-enum-types.h"
#include "notification-item-server.h"
#include "notification-watcher-client.h"
diff --git a/src/libappindicator/app-indicator.h b/src/app-indicator.h
index 549ab35..549ab35 100644
--- a/src/libappindicator/app-indicator.h
+++ b/src/app-indicator.h
diff --git a/src/libappindicator/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in
index b80fded..b80fded 100644
--- a/src/libappindicator/appindicator-0.1.pc.in
+++ b/src/appindicator-0.1.pc.in