X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.sdkbuild.mk;h=38ec7bd26b0cef468b8608717d045e016fc3a807;hb=5a731d5e706b85ff2b350fa2f2e54e3522c35016;hp=112c288f9b99beb4875de341f50c8c9292f99423;hpb=ef5b2363627dadacfee7da6ee0c7d1c2b40a30db;p=dpdk.git diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 112c288f9b..38ec7bd26b 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -1,12 +1,12 @@ # BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -16,7 +16,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -40,13 +40,6 @@ else include $(RTE_SDK)/mk/rte.vars.mk endif -ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) -LIBPCAP_CFLAGS ?= $(shell pcap-config --cflags) -EXTERNAL_LIB_CFLAGS += $(LIBPCAP_CFLAGS) -endif - -export EXTERNAL_LIB_CFLAGS - # # include .depdirs and define rules to order priorities between build # of directories. @@ -67,10 +60,10 @@ CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-)) .PHONY: build build: $(ROOTDIRS-y) - @echo Build complete + @echo "Build complete [$(RTE_TARGET)]" ifneq ($(DESTDIR),) $(Q)mkdir -p $(DESTDIR) - $(Q)tar -C $(RTE_SDK) -cf - mk | tar -C $(DESTDIR) -x \ + $(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 - \ @@ -100,7 +93,7 @@ $(ROOTDIRS-y): @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ @echo "== Build $@" $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = lib -a $(RTE_BUILD_COMBINE_LIBS) = y ]; then \ + @if [ $@ = drivers -a $(CONFIG_RTE_BUILD_COMBINE_LIBS) = y ]; then \ $(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \ fi