summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-10 10:39:21 +0100
committerDamjan Marion <dmarion.lists@gmail.com>2017-01-10 09:40:45 +0000
commit6bbf83a01b813b3d50b27ab9001d25cae5c4592a (patch)
tree0d7c64c55966b1f32ad166768aa5eedff7fbe4fb /Makefile
parent842b9c59cc21b3e2917aaa25069fb15addf976f1 (diff)
Revert "vppctl: bash completion for vppctl commands"
This patch is causing build failures This reverts commit d995c757f05f78aa759b0a65c0a7e38088e690a9. Change-Id: I0c8d5a4208135d77aaa3a6a470d26140f7b74733 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile46
1 files changed, 7 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index 7c3dded21d0..6af33b08c06 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config doxygen graphviz
-DEB_DEPENDS += python-dev python-virtualenv python-pip python-pyparsing python-jinja2 lcov chrpath autoconf
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
else
@@ -41,9 +41,9 @@ else
endif
RPM_DEPENDS_GROUPS = 'Development Tools'
-RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils doxygen graphviz
+RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv pyparsing python-jinja2 lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
EPEL_DEPENDS = libconfuse-devel ganglia-devel
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -183,35 +183,6 @@ distversion: $(BR)/scripts/.version
$(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
mv $(verstring).tar.gz $(BR)/rpm
-deb-depends-check:
-ifeq ($(OS_ID),ubuntu)
- @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
- if [ -n "$$MISSING" ] ; then \
- echo "\nPlease install missing packages: \n$$MISSING\n" ; \
- echo "by executing \"make install-dep\"\n" ; \
- exit 1 ; \
- fi; \
- exit 0
-endif
-
-rpm-depends-check:
-ifeq ($(OS_ID),centos)
- @RPM_DEPENDS_ARRAY=($(RPM_DEPENDS)) ; \
- for i in "$${!RPM_DEPENDS_ARRAY[@]}"; do \
- if ! yum list installed "$${RPM_DEPENDS_ARRAY[$$i]}" >/dev/null 2>&1; then \
- if ! [[ "$${RPM_DEPENDS_ARRAY[$$i]}" == *"://"* ]] ; then \
- MISSING="$$MISSING $${RPM_DEPENDS_ARRAY[$$i]}" ; \
- fi; \
- fi; \
- done; \
- if [ -n "$$MISSING" ] ; then \
- echo "\nPlease install missing packages: \n$$MISSING\n" ; \
- echo "by executing \"make install-dep\"\n" ; \
- exit 1 ; \
- fi; \
- exit 0
-endif
-
build: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM)_debug,vpp-install)
@@ -315,10 +286,10 @@ build-vat:
run-vat:
@sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
-pkg-deb: deb-depends-check doxygen-siphon-list
+pkg-deb:
$(call make,$(PLATFORM),install-deb)
-pkg-rpm: dist rpm-depends-check doxygen-siphon-list
+pkg-rpm: dist
$(call make,$(PLATFORM),install-rpm)
ctags: ctags.files
@@ -350,7 +321,7 @@ endef
.PHONY: bootstrap-doxygen doxygen wipe-doxygen
-bootstrap-doxygen: deb-depends-check rpm-depends-check
+bootstrap-doxygen:
$(call make-doxy)
doxygen:
@@ -359,9 +330,6 @@ doxygen:
wipe-doxygen:
$(call make-doxy)
-doxygen-siphon-list:
- $(call make-doxy)
-
define banner
@echo "========================================================================"
@echo " $(1)"