Skip to content

Commit

Permalink
[packaging] Remove sailfish headers from the ofono-devel
Browse files Browse the repository at this point in the history
Those symbols are not exported by ofono anyway and can't be
referenced by external plugins. Built-in plugins can pull those
headers directly from the source tree.
  • Loading branch information
monich committed Dec 19, 2019
1 parent 04b2a9b commit 08f8555
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
8 changes: 2 additions & 6 deletions ofono/Makefile.am
Expand Up @@ -32,11 +32,6 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \

nodist_pkginclude_HEADERS = include/version.h

if SAILFISH_MANAGER
nodist_pkginclude_HEADERS += include/sailfish_cell_info.h \
include/sailfish_manager.h
endif

local_headers = $(foreach file,$(pkginclude_HEADERS) \
$(nodist_pkginclude_HEADERS), \
include/ofono/$(notdir $(file)))
Expand Down Expand Up @@ -808,7 +803,8 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \

AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-I$(srcdir)/btio -I$(srcdir)/gril
-I$(srcdir)/btio -I$(srcdir)/gril \
-I$(srcdir)/plugins/sailfish_manager

doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
Expand Down
3 changes: 2 additions & 1 deletion ofono/drivers/ril/ril_plugin.c
Expand Up @@ -28,7 +28,8 @@
#include "ril_devmon.h"
#include "ril_log.h"

#include <ofono/sailfish_manager.h>
#include "sailfish_manager.h"

#include <ofono/watch.h>

#include <grilio_transport.h>
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 08f8555

Please sign in to comment.