Updated makefile, implemented basic layer

Author: sadko4u

README.md

@@ -1,2 +1,48 @@
 # lsp-r3d-base-lib
-Base library for 3D rendering
+
+Base library for implementing and loading 3D rendering backend.
+
+Requirements
+======
+
+The following packages need to be installed for building:
+
+* gcc >= 4.9
+* make >= 4.0
+
+Building
+======
+
+To build the library, perform the following commands:
+
+```bash
+make config # Configure the build
+make fetch # Fetch dependencies from Git repository
+make
+sudo make install
+```
+
+To get more build options, run:
+
+```bash
+make help
+```
+
+To uninstall library, simply issue:
+
+```bash
+make uninstall
+```
+
+To clean all binary files, run:
+
+```bash
+make clean
+```
+
+To clean the whole project tree including configuration files, run:
+
+```bash
+make prune
+```
+

dependencies.mk

@@ -2,10 +2,12 @@
 LSP_COMMON_LIB_VERSION     := 1.0.2
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_URL         := https://github.com/sadko4u/$(LSP_COMMON_LIB_NAME).git
+LSP_COMMON_LIB_TYPE        := hdr
 
 LSP_TEST_FW_VERSION        := 1.0.2
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_URL            := https://github.com/sadko4u/$(LSP_TEST_FW_NAME).git
+LSP_TEST_FW_TYPE           := src
 
 STDLIB_VERSION             := system
 STDLIB_LDFLAGS             := -lpthread -ldl

make/configure.mk

@@ -42,7 +42,20 @@ define pkgconfig =
   $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     :=))
 endef
 
-define bldconfig =
+define libconfig =
+  $(eval name = $(1))
+  $(if $($(name)_NAME), \
+    $(if $($(name)_LDLAGS),,  $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
+  )
+  $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     :=))
+endef
+
+define optconfig =
+  $(eval name = $(1))
+  $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     :=))
+endef
+
+define srcconfig =
   $(eval name = $(1))
   $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
@@ -59,13 +72,26 @@ define bldconfig =
   )
 endef
 
+define hdrconfig =
+  $(eval name = $(1))
+  $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
+  $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
+  $(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
+  $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\""$(xflags)))
+  $(if $($(name)_MFLAGS),, \
+    $(eval $(name)_MFLAGS := \
+      $(if $(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)),"-DLSP_BUILTIN_MODULE -fvisibility=hidden",)) \
+  )
+endef
+
 define vardef =
   $(eval name = $(1))
   # Override variables if they are not defined
-  $(if $(findstring system,$($(name)_VERSION)), \
-    $(eval $(call pkgconfig, $(name))), \
-    $(eval $(call bldconfig, $(name))) \
-  )
+  $(if $(findstring pkg,$($(name)_TYPE)), $(eval $(call pkgconfig, $(name))))
+  $(if $(findstring src,$($(name)_TYPE)), $(eval $(call srcconfig, $(name))))
+  $(if $(findstring hdr,$($(name)_TYPE)), $(eval $(call hdrconfig, $(name))))
+  $(if $(findstring lib,$($(name)_TYPE)), $(eval $(call libconfig, $(name))))
+  $(if $(findstring opt,$($(name)_TYPE)), $(eval $(call optconfig, $(name))))
 endef
 
 # Define predefined variables
@@ -80,6 +106,7 @@ ifndef $(ARTIFACT_VARS)_PATH
 endif
 
 $(ARTIFACT_VARS)_TESTING    = $(TEST)
+$(ARTIFACT_VARS)_TYPE      := src
 
 OVERALL_DEPS := $(DEPENDENCIES) $(ARTIFACT_VARS)
 __tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
@@ -90,6 +117,7 @@ CONFIG_VARS = \
   $(foreach name, $(OVERALL_DEPS), \
     $(name)_NAME \
     $(name)_VERSION \
+    $(name)_TYPE \
     $(name)_BRANCH \
     $(name)_PATH \
     $(name)_INC \
@@ -132,11 +160,14 @@ help: | toolvars sysvars
 	@echo "  <ARTIFACT>_PATH           location of the source code of the artifact"
 	@echo "  <ARTIFACT>_SRC            path to source code files of the artifact"
 	@echo "  <ARTIFACT>_TEST           location of test files of the artifact"
+	@echo "  <ARTIFACT>_TYPE           artifact usage type"
+	@echo "                            - src - use sources and headers from git"
+    @echo "                            - hdr - use headers only from git"
+    @echo "                            - pkg - use pkgconfig for configuration"
+    @echo "                            - lib - use system headers and -l<libname> flags"
+    @echo "                            - opt - use optional configuration"
 	@echo "  <ARTIFACT>_URL            location of the artifact git repoisitory"
-	@echo "  <ARTIFACT>_VERSION        version of the artifact used for building:"
-	@echo "                              - version contained in git tag"
-	@echo "                              - git branch name"
-	@echo "                              - 'system' for system library use"
+	@echo "  <ARTIFACT>_VERSION        version of the artifact used for building"
 	@echo ""
 	@echo "Artifacts used for build:"
 	@echo "  $(DEPENDENCIES)"

make/modules.mk

@@ -7,21 +7,22 @@ include $(BASEDIR)/project.mk
 DEPENDENCIES       += $(TEST_DEPENDENCIES)
 
 # Form list of modules, exclude all modules that have 'system' version
-MODULES             = $(foreach dep, $(DEPENDENCIES), $(if $(findstring system,$($(dep)_VERSION)),,$(dep)))
+SRC_MODULES         = $(foreach dep, $(DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+HDR_MODULES         = $(foreach dep, $(DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
 
 # Branches
-.PHONY: $(MODULES)
+.PHONY: $(SRC_MODULES) $(HDR_MODULES)
 .PHONY: fetch prune clean
 
-$(MODULES):
+$(SRC_MODULES) $(HDR_MODULES):
 	@echo "Cloning $($(@)_URL) -> $($(@)_PATH) [$($(@)_BRANCH)]"
 	@test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
 	@$(GIT) -C "$($(@)_PATH)" fetch origin --prune --force
 	@$(GIT) -C "$($(@)_PATH)" fetch origin --prune '+refs/heads/*:refs/tags/*' --force
 	@$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_BRANCH) || \
 	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_BRANCH)
 
-fetch: $(MODULES)
+fetch: $(SRC_MODULES) $(HDR_MODULES)
 
 clean:
 	@echo rm -rf "$($(ARTIFACT_VARS)_BIN)/$(ARTIFACT_NAME)"

project.mk

@@ -2,7 +2,7 @@
 ARTIFACT_NAME               = lsp-r3d-base-lib
 ARTIFACT_VARS               = LSP_R3D_BASE_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_EXPORT_ALL         = 1
+ARTIFACT_EXPORT_ALL         = 0
 VERSION                     = 0.5.0-devel
 
 # List of dependencies

src/Makefile

@@ -0,0 +1,109 @@
+CONFIG                 := $(CURDIR)/.config.mk
+
+include $(CONFIG)
+include $(CURDIR)/../project.mk
+
+rwildcard               = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+CXX_SRCMAIN             = $(call rwildcard, main, *.cpp)
+CXX_SRCTEST             = $(call rwildcard, test, *.cpp)
+CXX_SRC                 = $(CXX_SRCMAIN)
+CXX_OBJ                 = $(patsubst %.cpp, $($(ARTIFACT_VARS)_BIN)/%.o, $(CXX_SRC))
+CXX_FILE                = $(patsubst $($(ARTIFACT_VARS)_BIN)/%.o,%.cpp, $(@))
+CXX_HEADERS             = $(foreach hdr,$(ARTIFACT_HEADERS),$(call rwildcard, $($(ARTIFACT_VARS)_INC)/$(hdr), *.h)
+CXX_INSTHEADERS         = $(patsubst $($(ARTIFACT_VARS)_INC)/%,$(DESTDIR)$(PREFIX)/include/%,$(CXX_HEADERS))
+
+ARTIFACT_BIN            = $($(ARTIFACT_VARS)_BIN)
+ARTIFACT_LIB            = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(LIBRARY_EXT)
+ARTIFACT_TESTBIN        = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-test$(EXECUTABLE_EXT)
+ARTIFACT_OBJ            = $($(ARTIFACT_VARS)_OBJ)
+ARTIFACT_MFLAGS         = $($(ARTIFACT_VARS)_MFLAGS) $(foreach dep,$(DEPENDENCIES),-DUSE_$(dep))
+
+CFLAGS_DEPS             = $(foreach dep, $(DEPENDENCIES) $(ARTIFACT_VARS), $(if $($(dep)_CFLAGS), $($(dep)_CFLAGS)))
+BUILD_DEPS              = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_OBJ), $(dep)))
+LINKER_DEPS             = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_LDFLAGS), $($(dep)_LDFLAGS)))
+LINKER_OBJS             = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_OBJ), $($(dep)_OBJ)))
+BUILD_ALL               = $(ARTIFACT_LIB)
+
+ifeq ($(TEST), 1)
+  ifeq ($($(ARTIFACT_VARS)_TESTING),1)
+    CXX_SRC                += $(CXX_SRCTEST)
+    BUILD_ALL              += $(ARTIFACT_TESTBIN)
+  endif
+  DEPENDENCIES           += $(TEST_DEPENDENCIES)
+endif
+
+ifeq ($(NO_DEPENDENCIES),1)
+  BUILD_DEPS              =
+endif
+
+CXX_DEPS                = $(foreach src,$(CXX_SRCMAIN) $(CXX_SRCTEST),$(patsubst %.cpp,$(ARTIFACT_BIN)/%.d,$(src)))
+CXX_DEPFILE             = $(patsubst $(ARTIFACT_BIN)/%.d,%.cpp,$(@))
+CXX_DEPTARGET           = $(patsubst $(ARTIFACT_BIN)/%.d,%.o,$(@))
+
+.DEFAULT_GOAL = all
+.PHONY: compile depend dep_clean all install uninstall
+.PHONY: $(BUILD_DEPS)
+
+compile: $(ARTIFACT_OBJ)
+
+all: $(BUILD_ALL)
+
+dep_clean:
+
+$(CXX_DEPS): dep_clean
+	@echo "  dep  [$(ARTIFACT_NAME)] $(CXX_DEPFILE)"
+	@mkdir -p $(dir $(@))
+	$(CXX) -MM -MT "\$$($(ARTIFACT_VARS)_BIN)/$(CXX_DEPTARGET)" -MF $(@) $(CXX_DEPFILE) $(CXXFLAGS) $(INCLUDE) $(CFLAGS_DEPS)
+
+depend: $(CXX_DEPS)
+	$(foreach dep,$(DEPENDENCIES) $(ARTIFACT_VARS),\
+	  $(if $($(dep)_INC), \
+	    $(eval SED_RULES += s/$(shell echo "$($(dep)_INC)" | sed "s/\\//\\\\\//g")/\$$$$\\($(dep)_INC\\)/g;)\
+	  )\
+	  $(if $($(dep)_BIN), \
+	    $(eval SED_RULES += s/$(shell echo "$($(dep)_BIN)" | sed "s/\\//\\\\\//g")/\\$$$$\\($(dep)_BIN\\)/g;)\
+	  )\
+	)
+	@cat $(CXX_DEPS) | sed -E "$(SED_RULES)" >Makefile.d
+
+$(BUILD_DEPS):
+	@echo "make $(notdir $($(@)_OBJ))"
+	@$(MAKE) -s -C "$($(@)_PATH)" compile CONFIG="$(CONFIG)" NO_DEPENDENCIES="1"
+
+$(ARTIFACT_OBJ): $(BUILD_DEPS) $(CXX_OBJ)
+	@echo "  $(LD)   [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ))"
+	@$(LD) -o $(ARTIFACT_OBJ) -r $(CXX_OBJ)
+
+$(ARTIFACT_LIB): $(ARTIFACT_OBJ)
+	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_LIB))"
+	@$(CXX) -o $(ARTIFACT_LIB) $(LINKER_OBJS) $(ARTIFACT_OBJ) $(SO_FLAGS) $(LINKER_DEPS)
+
+$(ARTIFACT_TESTBIN): $(ARTIFACT_OBJ)
+	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_TESTBIN))"
+	@$(CXX) -o $(ARTIFACT_TESTBIN) $(LINKER_OBJS) $(ARTIFACT_OBJ) $(EXE_FLAGS) $(LINKER_DEPS)
+
+$(CXX_OBJ):
+	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(CXX_FILE)"
+	@mkdir -p $(dir $@)
+	@$(CXX) -o $(@) -c $(CXX_FILE) -fPIC $(CXXFLAGS) $(ARTIFACT_MFLAGS) $(INCLUDE) $(CFLAGS_DEPS)
+
+install: all
+	@echo "Installing $($(ARTIFACT_VARS)_NAME)"
+	@mkdir -p "$(DESTDIR)$(PREFIX)/include"
+	@mkdir -p "$(DESTDIR)$(PREFIX)/lib"
+	@cp -r $($(ARTIFACT_VARS)_INC)/* "$(DESTDIR)$(PREFIX)/include/"
+	@echo $(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(PREFIX)/lib"
+	@$(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(PREFIX)/lib"
+	@ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(PREFIX)/lib/$($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)"
+	@echo "Install OK"
+
+uninstall:
+	@echo "Uninstalling $($(ARTIFACT_VARS)_NAME)"
+	@-rm -f "$(DESTDIR)$(PREFIX)/lib/$(notdir $(ARTIFACT_LIB))"
+	@-rm -f "$(DESTDIR)$(PREFIX)/lib/$($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)"
+	@echo rm -f $(CXX_INSTHEADERS)
+	@-rm -f $(CXX_INSTHEADERS)
+	@echo "Uninstall OK"
+
+# Dependencies
+-include $(CURDIR)/Makefile.d