aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-08-03 19:10:34 +0100
committerTed Gould <ted@canonical.com>2009-08-03 19:10:34 +0100
commitecde85f57823acace986724989fa57daf43799d2 (patch)
treee8259860ebd1441df757c76afcad03a50c96a8e7
parentb3d3f3de3bb73ac8cc77ed5c8bde5aeb76073af2 (diff)
downloadlibayatana-indicator-ecde85f57823acace986724989fa57daf43799d2.tar.gz
libayatana-indicator-ecde85f57823acace986724989fa57daf43799d2.tar.bz2
libayatana-indicator-ecde85f57823acace986724989fa57daf43799d2.zip
Creating a default little GTK library to move the GTK stuff in
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac10
-rw-r--r--libindicate-gtk/Makefile.am68
-rw-r--r--libindicate-gtk/indicate-gtk.pc.in14
-rw-r--r--libindicate-gtk/indicator.c5
-rw-r--r--libindicate-gtk/indicator.h0
6 files changed, 98 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ac6fe90..bdd32f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
SUBDIRS = \
src \
libindicate \
+ libindicate-gtk \
libindicator \
examples \
tests \
diff --git a/configure.ac b/configure.ac
index 89bfbd8..13f4b6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,14 @@ PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION
AC_SUBST(LIBINDICATE_CFLAGS)
AC_SUBST(LIBINDICATE_LIBS)
+PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GIO_REQUIRED_VERSION
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+ libxml-2.0 >= $XML_REQUIRED_VERSION)
+AC_SUBST(LIBINDICATEGTK_CFLAGS)
+AC_SUBST(LIBINDICATEGTK_LIBS)
+
###########################
# GObject Introspection
###########################
@@ -162,6 +170,8 @@ Makefile
src/Makefile
libindicate/Makefile
libindicate/indicate.pc
+libindicate-gtk/Makefile
+libindicate-gtk/indicate-gtk.pc
libindicator/Makefile
libindicator/indicator.pc
examples/Makefile
diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
new file mode 100644
index 0000000..0e1d08d
--- /dev/null
+++ b/libindicate-gtk/Makefile.am
@@ -0,0 +1,68 @@
+
+INCLUDES= \
+ -DG_LOG_DOMAIN=\"libindicate-gtk\"
+
+EXTRA_DIST = \
+ indicate-gtk.pc.in
+
+lib_LTLIBRARIES = \
+ libindicate-gtk.la
+
+libindicate_gtkincludedir=$(includedir)/libindicate-0.1/libindicate-gtk
+
+indicate_gtk_headers = \
+ indicator.h
+
+libindicate_gtkinclude_HEADERS = \
+ $(indicate_headers)
+
+libindicate_gtk_la_SOURCES = \
+ $(indicate_headers) \
+ indicator.c
+
+libindicate_gtk_la_LDFLAGS = \
+ -version-info $(LIBINDICATE_CURRENT):$(LIBINDICATE_REVISION):$(LIBINDICATE_AGE) \
+ -no-undefined \
+ -export-symbols-regex "^[^_d].*"
+
+libindicate_gtk_la_CFLAGS = \
+ $(LIBINDICATEGTK_CFLAGS)
+
+libindicate_gtk_la_LIBADD = \
+ $(LIBINDICATEGTK_LIBS)
+
+pkgconfig_DATA = indicate-gtk.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+if USE_GIR
+
+gobjectintrospection_gir_DATA = \
+ Indicate-gtk-0.1.gir
+gobjectintrospection_girdir = $(datadir)/gir
+
+gobjectintrospection_type_DATA = \
+ Indicate-gtk-0.1.typelib
+gobjectintrospection_typedir = $(libdir)/girepository
+
+irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
+Indicate-gtk-0.1.gir: $(irscanner_headers)
+ $(G_IR_SCANNER) \
+ -v --namespace IndicateGtk \
+ --nsversion=0.1 \
+ --add-include-path=$(srcdir) \
+ --include=GObject-2.0 \
+ --include=GLib-2.0 \
+ --include=GdkPixbuf-2.0 \
+ --library=indicate --pkg indicate \
+ --output Indicate-gtk-0.1.gir $(irscanner_headers)
+
+Indicate-gtk-0.1.typelib: Indicate-gtk-0.1.gir
+ $(G_IR_COMPILER) \
+ --includedir=$(srcdir) Indicate-gtk-0.1.gir \
+ -o Indicate-gtk-0.1.typelib
+
+DISTCLEANFILES = \
+ Indicate-gtk-0.1.gir \
+ Indicate-gtk-0.1.typelib
+
+endif
diff --git a/libindicate-gtk/indicate-gtk.pc.in b/libindicate-gtk/indicate-gtk.pc.in
new file mode 100644
index 0000000..28e3c81
--- /dev/null
+++ b/libindicate-gtk/indicate-gtk.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/libindicate-0.1
+Requires: gtk+-2.0 indicate
+Libs: -L${libdir} -lindicate-gtk
+
+Name: libindicate-gtk
+Description: libindicate GTK stuff.
+Version: @VERSION@
+
diff --git a/libindicate-gtk/indicator.c b/libindicate-gtk/indicator.c
new file mode 100644
index 0000000..d5f07ef
--- /dev/null
+++ b/libindicate-gtk/indicator.c
@@ -0,0 +1,5 @@
+
+void var (void) {
+
+ return;
+}
diff --git a/libindicate-gtk/indicator.h b/libindicate-gtk/indicator.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libindicate-gtk/indicator.h