X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;h=9c623c4c6305dd1fb91079e964d8c88be87fee16;hb=586f6c4d78a8bc462597652ac7699fac0630db1b;hp=02646026e91431c7c557df9936d688f2eed136fb;hpb=b884a463086b9841ef3f7b324f320db5e6e11492;p=osm%2Fdevops.git

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index 02646026..9c623c4c 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -24,7 +24,7 @@ CHARM_DIR        := $(TOPDIR)/juju-charms
 CHARM_SRC_DIR    := $(CHARM_DIR)/layers
 CHARM_DOCKER_TAG := charm-tools
 CHARM_BUILD_DIR  := $(CHARM_DIR)/builds
-DOCKER_BUILD     ?= $(shell which docker)
+DOCKER_BUILD     ?=
 
 Q=@
 
@@ -36,25 +36,27 @@ BUILD_VNFD   := $(shell readlink -f .|sed -e 's/\/.*descriptor-packages//' | gre
 DEP_FILES = $(wildcard src/*)
 
 ifdef BUILD_VNFD
-$(BUILD_DIR)/$(PKG_BASE_NAME): src $(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
 	$(Q)mkdir -p $@
 	$(Q)cp -rf $</. $@
 	$(Q)$(GEN_VNFD_PKG) $< $@
 else
-$(BUILD_DIR)/$(PKG_BASE_NAME): src $(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
 	$(Q)mkdir -p $@
 	$(Q)cp -rf $</. $@
 	$(Q)$(GEN_NSD_PKG) $< $@
 endif
 
 ifdef VNFD_CHARM
-$(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
+$(BUILD_DIR)/$(PKG_NAME): $(DEP_FILES) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
 	$(Q)echo "building $(PKG_BASE_NAME) with charm $(VNFD_CHARM)"
+	$(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
 	$(Q)cp -rf $(CHARM_BUILD_DIR)/$(VNFD_CHARM) $(BUILD_DIR)/$(PKG_BASE_NAME)/charms
 	$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
 else
-$(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME)
-	$(Q)echo "building $(PKG_BASE_NAME)"
+$(BUILD_DIR)/$(PKG_NAME): $(DEP_FILES)
+	$(Q)echo "building $(PKG_BASE_NAME) $(BUILD_DIR)"
+	$(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
 	$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
 endif