diff --git a/pickering-lxi/Makefile b/pickering-lxi/Makefile
index 0ba7fc77e118ca43be2ab1a946d3837167445212..a32bc28a4944872b0c7994aad14765f6717f5edd 100644
--- a/pickering-lxi/Makefile
+++ b/pickering-lxi/Makefile
@@ -9,14 +9,25 @@
 #
 ################################################################################
 
+# build machinery
+#
+# include the build environment
+include ../common.mk
+
+CFLAGS= -g -Wall -fPIC
+CFLAGS+=-DGIT_VERSION=\"$(GIT_VERSION)\"
+
+# standard deployment paths
+LIBROOT ?= /acc/local/$(CPU)/drv/pickering-lxi/$(DISTRO_VERSION)
+LIBDIR ?= $(LIBROOT)/lib
+INCSYSDIR ?= $(LIBROOT)/include/pickering-lxi
+
 # Distribution version
 DISTRO_VERSION=1.10.3
 
-# Specify C compiler
-CC=gcc
-
 # Specify C++ compiler
-GG=g++
+CPPFLAGS += -fPIC
+GG=$(CXX) $(CPPFLAGS)
 
 # General
 CURDIR=`pwd`
@@ -28,11 +39,6 @@ INCOPT=-I./src/Picmlx -I./src/Piplx -I./src/Pipslx -I./src/Pi743lx
 LINKOPTS=-lpthread -ldl
 CFLAGS_MODULES_DEBUG=
 
-# standard deployment paths
-LIBROOT ?= /acc/local/$(CPU)/drv/pickering-lxi/$(DISTRO_VERSION)
-LIBDIR ?= $(LIBROOT)/lib
-INCSYSDIR ?= $(LIBROOT)/include/pickering-lxi
-
 # Picmlx - Communication module
 PICMLX_VERSION=$(shell grep "\#define *PICMLX_MODULE_VERSION" src/Picmlx/Picmlx.cpp | sed 's/\r$$//'\
  | sed 's/[ \t]*[ \t]/ /g' | cut -f3 -d' '\
@@ -138,10 +144,10 @@ picmlx: setup $(PICMLXOBJS)
 	@echo " "
 
 $(OBJSDIR)/%.cpp.o: $(PICMLXSRCDIR)/%.cpp
-	$(GG) $(CFLAGS_PICMLX) -fPIC -c -o $@ $<
+	$(GG) $(CFLAGS_PICMLX) -c -o $@ $<
 
 $(OBJSDIR)/%.cpp.o: $(SRCDIR)/%.cpp
-	$(GG) $(CFLAGS_PICMLX) -fPIC -c -o $@ $<
+	$(GG) $(CFLAGS_PICMLX) -c -o $@ $<
 	
 #############################################################################