unify tools naming

[dpdk.git] / mk / internal / rte.compile-pre.mk

diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index 648b5e6..f740179 100644 (file)
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
-# 
+#
 #   Copyright(c) 2010-2014 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
@@ -84,10 +84,22 @@ C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
 C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
 C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)","  CC $(@)")
 endif
-C_TO_O_CMD = "cmd_$@ = $(C_TO_O_STR)"
+PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
+PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
+PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@
+PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \
+       echo "$(if $V,$(PMDINFO_GEN),  PMDINFO $@.pmd.c)" && \
+       $(PMDINFO_GEN) && \
+       echo "$(if $V,$(PMDINFO_CC),  CC $@.pmd.o)" && \
+       $(PMDINFO_CC) && \
+       echo "$(if $V,$(PMDINFO_LD),  LD $@)" && \
+       $(PMDINFO_LD) && \
+       mv -f $@.o $@; fi
+C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)'
 C_TO_O_DO = @set -e; \
        echo $(C_TO_O_DISP); \
        $(C_TO_O) && \
+       $(PMDINFO_TO_O) && \
        echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \
        sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \
        rm -f $(call obj2dep,$(@)).tmp
@@ -99,7 +111,7 @@ compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
 file_missing = $(call compare,$(wildcard $@),$@)
 
 # return a non-empty string if cmdline changed
-cmdline_changed = $(call compare,$(cmd_$@),$(1))
+cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1)))
 
 # return a non-empty string if a dependency file does not exist
 depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@))
@@ -127,12 +139,12 @@ boolean = $(if $1,1,0)
        $(if $(D),\
                @echo -n "$< -> $@ " ; \
                echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-               echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O_STR))) " ; \
+               echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \
                echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
                echo "depfile_newer=$(call boolean,$(depfile_newer))")
        $(if $(or \
                $(file_missing),\
-               $(call cmdline_changed,$(C_TO_O_STR)),\
+               $(call cmdline_changed,$(C_TO_O)),\
                $(depfile_missing),\
                $(depfile_newer)),\
                $(C_TO_O_DO))