On Tue, Apr 2, 2019 at 9:51 PM Thomas Monjalon <tho...@monjalon.net> wrote:
> 02/04/2019 21:46, David Marchand: > > On Tue, Apr 2, 2019 at 9:30 PM Thomas Monjalon <tho...@monjalon.net> > wrote: > > > > > Only one header file (rte_kni_common.h) was in the sub-directory > > > include/exec-env/ > > > This file was installed in a sub-directory of the same name > > > in the makefile-based build. > > > Source and install directories are moved as below: > > > > > > lib/librte_eal/linux/eal/include/exec-env/ > > > -> lib/librte_eal/linux/eal/include/ > > > > > > build/include/exec-env/ > > > -> build/include/ > > > > > > The consequence is to have a file hierarchy a bit more flat. > > > > > > Signed-off-by: Thomas Monjalon <tho...@monjalon.net> > > > > > > > Looks good to me. > > Reviewed-by: David Marchand <david.march...@redhat.com> > > Tested-by: David Marchand <david.march...@redhat.com> > > Applied > As a followup, I noticed this: [dmarchan@dmarchan dpdk]$ for file in $(find lib/librte_eal/*/eal -name *.h); do echo $(basename $file); git grep -l $(basename $file); echo; done eal_alarm_private.h lib/librte_eal/freebsd/eal/eal_alarm.c lib/librte_eal/freebsd/eal/eal_interrupts.c eal_vfio.h lib/librte_eal/linux/eal/eal.c lib/librte_eal/linux/eal/eal_interrupts.c lib/librte_eal/linux/eal/eal_vfio.c lib/librte_eal/linux/eal/eal_vfio_mp_sync.c rte_kni_common.h kernel/linux/kni/kni_dev.h kernel/linux/kni/kni_fifo.h kernel/linux/kni/kni_misc.c kernel/linux/kni/kni_net.c lib/librte_eal/linux/eal/Makefile lib/librte_kni/rte_kni.c lib/librte_kni/rte_kni.h At the moment, kni is the only special case where users need to set a CFLAGS -I...eal/include for. But we have some drivers directly referencing linux/eal, linux/eal/include and a funny $(SYSTEM)app/eal: [dmarchan@dmarchan dpdk]$ git grep CFLAGS.*/eal drivers/bus/dpaa/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/bus/pci/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal drivers/bus/vmbus/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal drivers/crypto/caam_jr/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/crypto/dpaa2_sec/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/crypto/dpaa_sec/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/event/dpaa/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal/include drivers/event/dpaa2/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/mempool/dpaa2/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/net/dpaa/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal/include drivers/net/dpaa2/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal drivers/raw/dpaa2_qdma/Makefile:CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal Preparing a patch. -- David Marchand
