Makefile: allow building against an oFono variant

Makefile

@@ -5,6 +5,9 @@
 .PHONY: print_debug_lib print_release_lib print_coverage_lib
 .PHONY: debug_ext_so release_ext_so
 
+# Allow building against an oFono variant.
+OFONO_PKG ?= ofono
+
 #
 # Required packages
 #
@@ -13,7 +16,7 @@
 #
 
 LDPKGS = libgbinder-radio libgbinder libmce-glib libglibutil gobject-2.0 glib-2.0
-PKGS = ofono $(LDPKGS)
+PKGS = $(OFONO_PKG) $(LDPKGS)
 
 #
 # Default target
@@ -231,7 +234,7 @@ $(COVERAGE_LIB): $(COVERAGE_OBJS)
 # Install
 #
 
-PLUGINDIR ?= $$(pkg-config ofono --variable=plugindir)
+PLUGINDIR ?= $$(pkg-config $(OFONO_PKG) --variable=plugindir)
 ABS_PLUGINDIR := $(shell echo /$(PLUGINDIR) | sed -r 's|/+|/|g')
 
 INSTALL = install

lib/Makefile

@@ -6,12 +6,15 @@
 .PHONY: print_debug_lib print_release_lib print_coverage_lib
 .PHONY: pkgconfig install install-dev
 
+# Allow building against an oFono variant.
+OFONO_PKG ?= ofono
 
 #
 # Required packages
 #
 
-PKGS = libgbinder-radio libglibutil glib-2.0 gobject-2.0
+LDPKGS = libgbinder-radio libglibutil glib-2.0 gobject-2.0
+PKGS = $(OFONO_PKG) $(LDPKGS)
 
 #
 # Default target
@@ -78,7 +81,7 @@ BASE_FLAGS = -fPIC
 FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
   -MMD -MP $(shell pkg-config --cflags $(PKGS))
 FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \
-  $(shell pkg-config --libs $(PKGS)) -lpthread
+  $(shell pkg-config --libs $(LDPKGS)) -lpthread
 DEBUG_FLAGS = -g
 RELEASE_FLAGS =
 COVERAGE_FLAGS = -g

unit/common/Makefile

@@ -16,12 +16,15 @@ endif
 SRC ?= $(EXE).c
 # COMMON_SRC += test_main.c
 
+# Allow building against an oFono variant.
+OFONO_PKG ?= ofono
+
 #
 # Required packages
 #
 
 LINK_PKGS += libglibutil glib-2.0 gobject-2.0
-PKGS += $(LINK_PKGS) libgbinder libgbinder-radio
+PKGS += $(OFONO_PKG) $(LINK_PKGS) libgbinder libgbinder-radio
 
 #
 # Default target