aboutsummaryrefslogtreecommitdiff
path: root/libindicate
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-01-07 20:18:12 -0600
committerTed Gould <ted@canonical.com>2009-01-07 20:18:12 -0600
commit1068ff29ae8daba39a9b07a451a75a2e06f5e63c (patch)
treeee80dd694ba1e4fabd96978b9151862c7865cfe0 /libindicate
parent20c59cd98792162b952f0a0bc5f8d2b494b77910 (diff)
downloadlibayatana-indicator-1068ff29ae8daba39a9b07a451a75a2e06f5e63c.tar.gz
libayatana-indicator-1068ff29ae8daba39a9b07a451a75a2e06f5e63c.tar.bz2
libayatana-indicator-1068ff29ae8daba39a9b07a451a75a2e06f5e63c.zip
Fixing linking and libraries and includes oh my
Diffstat (limited to 'libindicate')
-rw-r--r--libindicate/Makefile.am18
-rw-r--r--libindicate/indicator.h3
-rw-r--r--libindicate/server.h3
3 files changed, 19 insertions, 5 deletions
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index f54be07..3f40d6d 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -1,10 +1,13 @@
INCLUDES= \
- -DG_LOG_DOMAIN=\"indicate\"
+ -DG_LOG_DOMAIN=\"libindicate\"
EXTRA_DIST = \
indicate-server.xml
+lib_LTLIBRARIES = \
+ libindicate.la
+
libindicateincludedir=$(includedir)/libindicate-1.0/libindicate
indicate_headers = \
@@ -14,17 +17,22 @@ indicate_headers = \
libindicateinclude_HEADERS = \
$(indicate_headers)
-libindicate_SOURCES = \
+libindicate_la_SOURCES = \
$(indicate_headers) \
- dbus-indicate-server.h
+ dbus-indicate-server.h \
server.c \
indicator.c
-libindicate_LDFLAGS = \
- -version-info 0:0:1 \
+libindicate_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex "^[^_].*"
+libindicate_la_CFLAGS = \
+ $(LIBINDICATE_CFLAGS)
+
+libindicate_la_LIBADD = \
+ $(LIBINDICATE_LIBS)
+
dbus-indicate-server.h: indicate-server.xml
libtool --mode=execute dbus-binding-tool \
--prefix=indicate_server \
diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index 93f551c..dd21c9d 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -2,6 +2,9 @@
#ifndef INDICATE_INDICATOR_H_INCLUDED__
#define INDICATE_INDICATOR_H_INCLUDED__ 1
+#include <glib.h>
+#include <glib-object.h>
+
/* Boilerplate */
#define INDICATE_TYPE_INDICATOR (indicate_indicator_get_type ())
#define INDICATE_INDICATOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_INDICATOR, IndicateIndicator))
diff --git a/libindicate/server.h b/libindicate/server.h
index 1627f21..632e357 100644
--- a/libindicate/server.h
+++ b/libindicate/server.h
@@ -2,6 +2,9 @@
#ifndef INDICATE_SERVER_H_INCLUDED__
#define INDICATE_SERVER_H_INCLUDED__ 1
+#include <glib.h>
+#include <glib-object.h>
+
/* Boilerplate */
#define INDICATE_TYPE_SERVER (indicate_server_get_type ())
#define INDICATE_SERVER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_SERVER, IndicateServer))