From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruce Richardson Subject: [PATCH 7/8] examples: put app name and sources at top of makefiles Date: Tue, 17 Oct 2017 17:12:19 +0100 Message-ID: <20171017161220.59941-8-bruce.richardson@intel.com> References: <20171017161220.59941-1-bruce.richardson@intel.com> Cc: Bruce Richardson To: dev@dpdk.org Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 9B6231B81D for ; Tue, 17 Oct 2017 18:13:04 +0200 (CEST) In-Reply-To: <20171017161220.59941-1-bruce.richardson@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reorder the text in the makefiles, so that the app name and the source files are listed first. This then will allow them to be shared later in a combined makefile building with pkg-config and RTE_SDK-based build system. Signed-off-by: Bruce Richardson --- examples/bond/Makefile | 12 +++--- examples/cmdline/Makefile | 6 +++ examples/distributor/Makefile | 12 +++--- examples/eventdev_pipeline_sw_pmd/Makefile | 12 +++--- examples/exception_path/Makefile | 12 +++--- examples/helloworld/Makefile | 12 +++--- examples/ip_fragmentation/Makefile | 12 +++--- examples/ip_pipeline/Makefile | 62 +++++++++++++++--------------- examples/ip_reassembly/Makefile | 12 +++--- examples/ipsec-secgw/Makefile | 28 +++++++------- examples/ipv4_multicast/Makefile | 12 +++--- examples/kni/Makefile | 12 +++--- examples/l2fwd-cat/Makefile | 12 +++--- examples/l2fwd-crypto/Makefile | 12 +++--- examples/l2fwd-jobstats/Makefile | 12 +++--- examples/l2fwd-keepalive/Makefile | 12 +++--- examples/l2fwd/Makefile | 12 +++--- examples/l3fwd-acl/Makefile | 12 +++--- examples/l3fwd-power/Makefile | 12 +++--- examples/l3fwd-vf/Makefile | 12 +++--- examples/l3fwd/Makefile | 12 +++--- examples/link_status_interrupt/Makefile | 12 +++--- examples/load_balancer/Makefile | 12 +++--- examples/multi_process/l2fwd_fork/Makefile | 12 +++--- examples/packet_ordering/Makefile | 12 +++--- examples/ptpclient/Makefile | 12 +++--- examples/qos_meter/Makefile | 12 +++--- examples/qos_sched/Makefile | 12 +++--- examples/rxtx_callbacks/Makefile | 12 +++--- examples/skeleton/Makefile | 12 +++--- examples/tep_termination/Makefile | 12 +++--- examples/timer/Makefile | 12 +++--- examples/vhost/Makefile | 12 +++--- examples/vhost_scsi/Makefile | 12 +++--- examples/vm_power_manager/Makefile | 14 +++---- examples/vmdq/Makefile | 12 +++--- examples/vmdq_dcb/Makefile | 12 +++--- 37 files changed, 257 insertions(+), 249 deletions(-) diff --git a/examples/bond/Makefile b/examples/bond/Makefile index ae4cb6e12..5e7927489 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = bond_app + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = bond_app - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 5155a6c80..118082e04 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = cmdline + +# all source are stored in SRCS-y +SRCS-y := main.c commands.c parse_obj_list.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 404993ebf..e800446ae 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = distributor_app + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = distributor_app - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/examples/eventdev_pipeline_sw_pmd/Makefile b/examples/eventdev_pipeline_sw_pmd/Makefile index de4e22c88..eac984734 100644 --- a/examples/eventdev_pipeline_sw_pmd/Makefile +++ b/examples/eventdev_pipeline_sw_pmd/Makefile @@ -28,6 +28,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = eventdev_pipeline_sw_pmd + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -37,12 +43,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = eventdev_pipeline_sw_pmd - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index d16f74f6f..010cc82e7 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = exception_path + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = exception_path - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index c83ec01e8..53bb9620f 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = helloworld + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = helloworld - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 4bc01abb9..b6f63e7be 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -30,6 +30,12 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# binary name +APP = ip_fragmentation + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -39,12 +45,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = ip_fragmentation - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 12ce0a1d5..05137eb14 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -29,6 +29,37 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = ip_pipeline + +VPATH += $(SRCDIR)/pipeline + +# all source are stored in SRCS-y +SRCS-y := main.c +SRCS-y += config_parse.c +SRCS-y += parser.c +SRCS-y += config_parse_tm.c +SRCS-y += config_check.c +SRCS-y += init.c +SRCS-y += thread.c +SRCS-y += thread_fe.c +SRCS-y += cpu_core_map.c + +SRCS-y += pipeline_common_be.c +SRCS-y += pipeline_common_fe.c +SRCS-y += pipeline_master_be.c +SRCS-y += pipeline_master.c +SRCS-y += pipeline_passthrough_be.c +SRCS-y += pipeline_passthrough.c +SRCS-y += pipeline_firewall_be.c +SRCS-y += pipeline_firewall.c +SRCS-y += pipeline_flow_classification_be.c +SRCS-y += pipeline_flow_classification.c +SRCS-y += pipeline_flow_actions_be.c +SRCS-y += pipeline_flow_actions.c +SRCS-y += pipeline_routing_be.c +SRCS-y += pipeline_routing.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,38 +69,9 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = ip_pipeline - -VPATH += $(SRCDIR)/pipeline - INC += $(sort $(wildcard *.h)) $(sort $(wildcard pipeline/*.h)) -# all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := main.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_parse.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += parser.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_parse_tm.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_check.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += init.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += thread.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += thread_fe.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += cpu_core_map.c - -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_common_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_common_fe.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_master_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_master.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_passthrough_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_passthrough.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_firewall_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_firewall.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_flow_classification_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_flow_classification.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_flow_actions_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_flow_actions.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_routing_be.c -SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_routing.c +SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := $(SRCS-y) CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/pipeline CFLAGS += -O3 diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 85c64a38b..c17055b5f 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -30,6 +30,12 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# binary name +APP = ip_reassembly + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -39,12 +45,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = ip_reassembly - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 17e915510..e115ca56e 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -29,6 +29,20 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +APP = ipsec-secgw + +# +# all source are stored in SRCS-y +# +SRCS-y += parser.c +SRCS-y += ipsec.c +SRCS-y += esp.c +SRCS-y += sp4.c +SRCS-y += sp6.c +SRCS-y += sa.c +SRCS-y += rt.c +SRCS-y += ipsec-secgw.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,8 +52,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -APP = ipsec-secgw - CFLAGS += -O3 -gdwarf-2 CFLAGS += $(WERROR_FLAGS) ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) @@ -50,16 +62,4 @@ ifeq ($(DEBUG),1) CFLAGS += -DIPSEC_DEBUG -fstack-protector-all -O0 endif -# -# all source are stored in SRCS-y -# -SRCS-y += parser.c -SRCS-y += ipsec.c -SRCS-y += esp.c -SRCS-y += sp4.c -SRCS-y += sp6.c -SRCS-y += sa.c -SRCS-y += rt.c -SRCS-y += ipsec-secgw.c - include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 1f7c53af3..28a3a619e 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -30,6 +30,12 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# binary name +APP = ipv4_multicast + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -39,12 +45,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = ipv4_multicast - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 08a4f0c57..89304ade5 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = kni + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -43,12 +49,6 @@ $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif -# binary name -APP = kni - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index a7fe6d68e..66bc00f92 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd-cat + +# all source are stored in SRCS-y +SRCS-y := l2fwd-cat.c cat.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -42,12 +48,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd-cat - -# all source are stored in SRCS-y -SRCS-y := l2fwd-cat.c cat.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index e8224caee..49cffe965 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd-crypto + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd-crypto - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index ab089f661..d905ef86f 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd-jobstats + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd-jobstats - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index ca45a798d..a58a710cd 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd-keepalive + +# all source are stored in SRCS-y +SRCS-y := main.c shm.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd-keepalive - -# all source are stored in SRCS-y -SRCS-y := main.c shm.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) LDFLAGS += -lrt diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 8896ab452..52f852f23 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 3cd299f1b..aa1423211 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l3fwd-acl + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l3fwd-acl - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 9c4f44300..d68b413f8 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l3fwd-power + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -44,12 +50,6 @@ please change the definition of the RTE_TARGET environment variable) all: else -# binary name -APP = l3fwd-power - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index 989faf032..f95651945 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l3fwd-vf + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l3fwd-vf - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 $(USER_FLAGS) CFLAGS += $(WERROR_FLAGS) diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index d99a43ade..0ae1dc43b 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l3fwd + +# all source are stored in SRCS-y +SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l3fwd - -# all source are stored in SRCS-y -SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c - CFLAGS += -I$(SRCDIR) CFLAGS += -O3 $(USER_FLAGS) CFLAGS += $(WERROR_FLAGS) diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index d5ee073a4..9607da6ad 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = link_status_interrupt + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = link_status_interrupt - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile index f656e51ce..cff10e1b6 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = load_balancer + +# all source are stored in SRCS-y +SRCS-y := main.c config.c init.c runtime.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = load_balancer - -# all source are stored in SRCS-y -SRCS-y := main.c config.c init.c runtime.c - CFLAGS += -O3 -g CFLAGS += $(WERROR_FLAGS) CFLAGS_config.o := -D_GNU_SOURCE diff --git a/examples/multi_process/l2fwd_fork/Makefile b/examples/multi_process/l2fwd_fork/Makefile index 11ae8ff42..a703ed37f 100644 --- a/examples/multi_process/l2fwd_fork/Makefile +++ b/examples/multi_process/l2fwd_fork/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = l2fwd-fork + +# all source are stored in SRCS-y +SRCS-y := main.c flib.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = l2fwd_fork - -# all source are stored in SRCS-y -SRCS-y := main.c flib.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index de066c4cc..19fe743a7 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = packet_ordering + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = packet_ordering - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index b77cf7100..4cbb9528e 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = ptpclient + +# all source are stored in SRCS-y +SRCS-y := ptpclient.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = ptpclient - -# all source are stored in SRCS-y -SRCS-y := ptpclient.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index de1f12ce0..178835836 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = qos_meter + +# all source are stored in SRCS-y +SRCS-y := main.c rte_policer.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = qos_meter - -# all source are stored in SRCS-y -SRCS-y := main.c rte_policer.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 56829c215..3cd5c229f 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = qos_sched + +# all source are stored in SRCS-y +SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -45,12 +51,6 @@ all: clean: else -# binary name -APP = qos_sched - -# all source are stored in SRCS-y -SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS_args.o := -D_GNU_SOURCE diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 0fafbb721..4bf72fbee 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = rxtx_callbacks + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = rxtx_callbacks - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index 4a5d99f19..fc54c0a48 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = basicfwd + +# all source are stored in SRCS-y +SRCS-y := basicfwd.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = basicfwd - -# all source are stored in SRCS-y -SRCS-y := basicfwd.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 448e61832..9974e75fa 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = tep_termination + +# all source are stored in SRCS-y +SRCS-y := main.c vxlan_setup.c vxlan.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -43,12 +49,6 @@ $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif -# binary name -APP = tep_termination - -# all source are stored in SRCS-y -SRCS-y := main.c vxlan_setup.c vxlan.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -D_GNU_SOURCE diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 7db48ec6b..e4bce3161 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = timer + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = timer - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index add9f27bb..5b743af03 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = vhost-switch + +# all source are stored in SRCS-y +SRCS-y := main.c virtio_net.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -44,12 +50,6 @@ please change the definition of the RTE_TARGET environment variable) all: else -# binary name -APP = vhost-switch - -# all source are stored in SRCS-y -SRCS-y := main.c virtio_net.c - CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 CFLAGS += $(WERROR_FLAGS) CFLAGS += -D_GNU_SOURCE diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 0306a6ae2..1f3fd2a9a 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = vhost-scsi + +# all source are stored in SRCS-y +SRCS-y := scsi.c vhost_scsi.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -44,12 +50,6 @@ please change the definition of the RTE_TARGET environment variable) all: else -# binary name -APP = vhost-scsi - -# all source are stored in SRCS-y -SRCS-y := scsi.c vhost_scsi.c - CFLAGS += -O2 -D_FILE_OFFSET_BITS=64 CFLAGS += $(WERROR_FLAGS) CFLAGS += -D_GNU_SOURCE diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile index 9cf20a289..bee0f5e41 100644 --- a/examples/vm_power_manager/Makefile +++ b/examples/vm_power_manager/Makefile @@ -29,6 +29,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = vm_power_mgr + +# all source are stored in SRCS-y +SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c +SRCS-y += channel_monitor.c + ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0) $(error vm_power_manager requires libvirt >= 0.9.3) else @@ -42,13 +49,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = vm_power_mgr - -# all source are stored in SRCS-y -SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c -SRCS-y += channel_monitor.c - CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/ CFLAGS += $(WERROR_FLAGS) diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index 501728222..7deaf4506 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = vmdq_app + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = vmdq_app - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += $(WERROR_FLAGS) EXTRA_CFLAGS += -O3 diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 0c200a980..554f6c0cb 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -29,6 +29,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# binary name +APP = vmdq_dcb_app + +# all source are stored in SRCS-y +SRCS-y := main.c + ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif @@ -38,12 +44,6 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -# binary name -APP = vmdq_dcb_app - -# all source are stored in SRCS-y -SRCS-y := main.c - CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute -- 2.13.6