summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--salut/Makefile.am3
-rw-r--r--salut/protocol.h (renamed from src/protocol.h)0
-rw-r--r--src/Makefile.am3
3 files changed, 4 insertions, 2 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am
index c4e4b1aa..ca46c477 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -4,6 +4,7 @@ pkgconfig_DATA = telepathy-salut.pc
salutincludedir = $(includedir)/telepathy-salut-0/salut
salutinclude_HEADERS = \
- plugin.h
+ plugin.h \
+ protocol.h
endif
diff --git a/src/protocol.h b/salut/protocol.h
index 83d0a715..83d0a715 100644
--- a/src/protocol.h
+++ b/salut/protocol.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a7d97ac..bcaaad26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ CORE_SOURCES = \
debug.c \
debug.h \
protocol.c \
- protocol.h \
+ $(top_srcdir)/salut/protocol.h \
plugin-loader.c \
plugin-loader.h \
$(top_srcdir)/salut/plugin.h \
@@ -156,6 +156,7 @@ noinst_LTLIBRARIES = libsalut-convenience.la
AM_CFLAGS = \
-I $(top_srcdir) -I $(top_builddir) \
-I $(top_srcdir)/lib -I $(top_builddir)/lib \
+ -I $(top_srcdir)/salut \
-DG_LOG_DOMAIN=\"salut\" \
-DPLUGIN_DIR=\"$(libdir)/telepathy/salut-0\" \
$(ERROR_CFLAGS) \