scripts: move to buildtools

[dpdk.git] / mk / rte.sdkbuild.mk

diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
index 38ec7bd..db6b983 100644 (file)
--- a/mk/rte.sdkbuild.mk
+++ b/mk/rte.sdkbuild.mk
@@ -29,8 +29,6 @@
 #   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# If DESTDIR variable is given, install binary dpdk
-
 #
 # include rte.vars.mk if config file exists
 #
@@ -51,6 +49,7 @@ $(1): $(sort $(LOCAL_DEPDIRS-$(1)))
 endef
 
 $(foreach d,$(ROOTDIRS-y),$(eval $(call depdirs_rule,$(d))))
+drivers: | buildtools
 
 #
 # build and clean targets
@@ -61,28 +60,14 @@ CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-))
 .PHONY: build
 build: $(ROOTDIRS-y)
        @echo "Build complete [$(RTE_TARGET)]"
-ifneq ($(DESTDIR),)
-       $(Q)mkdir -p $(DESTDIR)
-       $(Q)tar -C $(RTE_SDK) -cf - mk scripts/*.sh | tar -C $(DESTDIR) -x \
-         --keep-newer-files --warning=no-ignore-newer -f -
-       $(Q)mkdir -p $(DESTDIR)/`basename $(RTE_OUTPUT)`
-       $(Q)tar -C $(RTE_OUTPUT) -chf - \
-         --exclude app --exclude hostapp --exclude build \
-         --exclude Makefile --exclude .depdirs . | \
-         tar -C $(DESTDIR)/`basename $(RTE_OUTPUT)` -x --keep-newer-files \
-         --warning=no-ignore-newer -f -
-       $(Q)install -D $(RTE_OUTPUT)/app/testpmd \
-         $(DESTDIR)/`basename $(RTE_OUTPUT)`/app/testpmd
-       @echo Installation in $(DESTDIR) complete
-endif
 
 .PHONY: clean
 clean: $(CLEANDIRS)
        @rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
-               $(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
+               $(RTE_OUTPUT)/lib \
                $(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod
        @[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include
-       @$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \
+       @$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \
                > $(RTE_OUTPUT)/include/rte_config.h
        $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean
        @echo Clean complete
@@ -93,8 +78,8 @@ $(ROOTDIRS-y):
        @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@
        @echo "== Build $@"
        $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all
-       @if [ $@ = drivers -a $(CONFIG_RTE_BUILD_COMBINE_LIBS) = y ]; then \
-               $(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \
+       @if [ $@ = drivers ]; then \
+               $(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \
        fi
 
 %_clean: