X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.app.mk;h=7a27a3afb985b270cfb678dd27208d93be4fbecb;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=d96475f8a7f3c23010beb916aac720a5f0f65b3e;hpb=aeec17c200a091c1aabf2a717622d0d1610ea863;p=dpdk.git diff --git a/mk/rte.app.mk b/mk/rte.app.mk index d96475f8a7..7a27a3afb9 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -1,13 +1,13 @@ # BSD LICENSE -# +# # Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # Copyright(c) 2014 6WIND S.A. # 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 @@ -17,7 +17,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 @@ -73,14 +73,6 @@ LDLIBS += -lrte_ivshmem endif endif -ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y) -LDLIBS += -lrte_pmd_virtio_uio -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y) -LDLIBS += -lrte_pmd_vmxnet3_uio -endif - ifeq ($(CONFIG_RTE_LIBRTE_TIMER),y) LDLIBS += -lrte_timer endif @@ -159,7 +151,15 @@ LDLIBS += -lrte_pmd_xenvirt LDLIBS += -lxenstore endif -ifeq ($(RTE_BUILD_SHARED_LIB),n) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) + +ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y) +LDLIBS += -lrte_pmd_vmxnet3_uio +endif + +ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y) +LDLIBS += -lrte_pmd_virtio_uio +endif ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) LDLIBS += -lrte_pmd_ixgbe