LIB-13: Standard project layout (src dir added)

Makefile

@@ -3,45 +3,22 @@
 # This file may be used under the terms of the GNU General Public License version 3
 # see LICENSE.txt
 
-include Makefile.conf
+.PHONY: src test install uninstall clean
 
-TARGET=libpEpAdapter.a
+all: src
 
-.PHONY: install uninstall clean
+src:
+	$(MAKE) -C src
 
-SOURCE=$(wildcard *.cc)
-HEADERS=$(wildcard *.hh *.hxx)
-OBJECTS=$(subst .cc,.o,$(SOURCE))
-DEPENDS=$(subst .cc,.d,$(SOURCE))
-CXXFLAGS+= -MMD -MP
-
-all: $(TARGET)
-
-ifneq ($(MAKECMDGOALS),clean)
-    -include $(DEPENDS)
-endif
-
-lib: $(TARGET)
-
-all: lib
-
-test: lib
+test: src
 	$(MAKE) -C test
 
-$(TARGET): $(OBJECTS)
-	$(AR) -rc $@ $^
-
 clean:
-	rm -vf $(TARGET) $(OBJECTS) $(DEPENDS)
-	rm -f *.d.*
+	$(MAKE) -C src clean
 	$(MAKE) -C test clean
 
-install: $(TARGET)
-	mkdir -p $(PREFIX)/include/pEp
-	mkdir -p $(PREFIX)/lib
-	cp -v $(HEADERS) $(PREFIX)/include/pEp/
-	cp -v $(TARGET) $(PREFIX)/lib/
+install:
+	$(MAKE) -C src install
 
 uninstall:
-	cd $(PREFIX)/include/pEp && rm -vf $(HEADERS)
-	cd $(PREFIX)/lib && rm -vf $(TARGET)
+	$(MAKE) -C src uninstall

Makefile.conf

@@ -5,6 +5,7 @@
 
 HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
 
+TARGET=libpEpAdapter.a
 
 # Defaults
 DEBUG=1

src/Makefile

@@ -0,0 +1,37 @@
+# Copyright 2018, pEp Foundation
+# This file is part of lib pEp Adapter
+# This file may be used under the terms of the GNU General Public License version 3
+# see LICENSE.txt
+
+include ../Makefile.conf
+
+SOURCE=$(wildcard *.cc)
+HEADERS=$(wildcard *.hh *.hxx)
+OBJECTS=$(subst .cc,.o,$(SOURCE))
+DEPENDS=$(subst .cc,.d,$(SOURCE))
+CXXFLAGS+= -MMD -MP
+
+ifneq ($(MAKECMDGOALS),clean)
+    -include $(DEPENDS)
+endif
+
+.PHONY: install uninstall clean
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	$(AR) -rc $@ $^
+
+clean:
+	rm -vf $(TARGET) $(OBJECTS) $(DEPENDS)
+	rm -f *.d.*
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/include/pEp
+	mkdir -p $(PREFIX)/lib
+	cp -v $(HEADERS) $(PREFIX)/include/pEp/
+	cp -v $(TARGET) $(PREFIX)/lib/
+
+uninstall:
+	cd $(PREFIX)/include/pEp && rm -vf $(HEADERS)
+	cd $(PREFIX)/lib && rm -vf $(TARGET)

test/Makefile

@@ -1,8 +1,8 @@
 include ../Makefile.conf
 
-LDFLAGS=-L../ $(ENGINE_LIB)
+LDFLAGS=-L../src $(ENGINE_LIB)
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
-CXXFLAGS+=-I../ $(ENGINE_INC) -std=c++11 -DENGINE_TEST=$(ENGINE_TEST)
+CXXFLAGS+=-I../src $(ENGINE_INC) -std=c++11 -DENGINE_TEST=$(ENGINE_TEST)
 
 SRC=$(wildcard test_*.cc)
 TST=$(subst .cc,,$(SRC))
@@ -13,7 +13,7 @@ $(TST): framework.o
 
 .PHONY: clean rmtestdata
 
-clean:	
+clean:
 	rm -f $(TST)
 	rm -Rf *.dSYM
 	rm -f *.o