build/linux: rename macro from LINUXAPP to LINUX

[dpdk.git] / lib / meson.build

diff --git a/lib/meson.build b/lib/meson.build
index 9d1f353..99957ba 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -8,10 +8,11 @@
 # sometimes skip deps that would be implied by others, e.g. if mempool is
 # given as a dep, no need to mention ring. This is especially true for the
 # core libs which are widely reused, so their deps are kept to a minimum.
-libraries = [ 'compat', # just a header, used for versioning
-       'cmdline', # ethdev depends on cmdline for parsing functions
+libraries = [
        'kvargs', # eal depends on kvargs
-       'eal', 'ring', 'mempool', 'mbuf', 'net', 'ethdev', 'pci', # core
+       'eal', # everything depends on eal
+       'cmdline', # ethdev depends on cmdline for parsing functions
+       'ring', 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
        'metrics', # bitrate/latency stats depends on this
        'hash',    # efd depends on this
        'timer',   # eventdev depends on this
@@ -20,8 +21,10 @@ libraries = [ 'compat', # just a header, used for versioning
        'distributor', 'efd', 'eventdev',
        'gro', 'gso', 'ip_frag', 'jobstats',
        'kni', 'latencystats', 'lpm', 'member',
-       'meter', 'power', 'pdump', 'rawdev',
+       'power', 'pdump', 'rawdev',
        'reorder', 'sched', 'security', 'vhost',
+       #ipsec lib depends on crypto and security
+       'ipsec',
        # add pkt framework libs which use other libs from above
        'port', 'table', 'pipeline',
        # flow_classify lib depends on pkt framework table lib
@@ -79,7 +82,7 @@ foreach l:libraries
                        foreach d:deps
                                if not is_variable('shared_rte_' + d)
                                        error('Missing dependency ' + d +
-                                               ' for library ' + lib_name)
+                                               ' for library ' + libname)
                                endif
                                shared_deps += [get_variable('shared_rte_' + d)]
                                static_deps += [get_variable('static_rte_' + d)]
@@ -93,10 +96,8 @@ foreach l:libraries
                                lib_version = '@0@.1'.format(version)
                                so_version = '@0@'.format(version)
                        else
-                               prj_ver = meson.project_version().split('.')
-                               lib_version = '@0@.@1@'.format(
-                                               prj_ver.get(0), prj_ver.get(1))
-                               so_version = lib_version
+                               lib_version = major_version
+                               so_version = major_version
                        endif
 
                        # first build static lib
@@ -132,6 +133,7 @@ foreach l:libraries
                                        dependencies: shared_deps)
 
                        dpdk_libraries = [shared_lib] + dpdk_libraries
+                       dpdk_static_libraries = [static_lib] + dpdk_static_libraries
                endif # sources.length() > 0
 
                set_variable('shared_' + libname, shared_dep)