From 8c4b047ad1e2914c48fcf9b099b012c1334ed526 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 14 Jan 2015 10:44:26 -0500
Subject: [PATCH] API: Move the public API in a new folder
Refs #63769
Change-Id: Ic35e28eb8d43f2e264ae2003ebf3cab8994ce884
---
daemon/bin/Makefile.am | 6 ++++--
daemon/bin/dbus/Makefile.am | 3 ++-
daemon/globals.mak | 1 +
daemon/src/{ => public}/ring.h | 0
4 files changed, 7 insertions(+), 3 deletions(-)
rename daemon/src/{ => public}/ring.h (100%)
diff --git a/daemon/bin/Makefile.am b/daemon/bin/Makefile.am
index 2df6699f69..6e340d78d3 100644
--- a/daemon/bin/Makefile.am
+++ b/daemon/bin/Makefile.am
@@ -9,6 +9,7 @@ if HAVE_OSX
libexec_PROGRAMS = ringcli
ringcli_SOURCES = osxmain.cpp
ringcli_CXXFLAGS = -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/public \
-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
ringcli_LDADD = $(top_builddir)/src/libring.la
endif
@@ -20,8 +21,9 @@ libexec_PROGRAMS = dring
dring_SOURCES = main.cpp
-dring_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
- -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
+dring_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
+ -I$(top_srcdir)/src/public \
+ -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la
endif
diff --git a/daemon/bin/dbus/Makefile.am b/daemon/bin/dbus/Makefile.am
index 33a89108b5..121fedef3d 100644
--- a/daemon/bin/dbus/Makefile.am
+++ b/daemon/bin/dbus/Makefile.am
@@ -48,7 +48,8 @@ libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
endif
libclient_dbus_la_CXXFLAGS = -I../ \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/public \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/ring\" \
$(DBUSCPP_CFLAGS)
diff --git a/daemon/globals.mak b/daemon/globals.mak
index 9e23e0df5b..90f2f5162d 100644
--- a/daemon/globals.mak
+++ b/daemon/globals.mak
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
+ -I$(src)/src/public \
$(SIP_CFLAGS) \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/ring\" \
diff --git a/daemon/src/ring.h b/daemon/src/public/ring.h
similarity index 100%
rename from daemon/src/ring.h
rename to daemon/src/public/ring.h
--
GitLab