build: move "libnm/" to "src/" and split it

Like with "libnm-core/", split "libnm/" into different directories for
the public headers, for the implementation and for the helper "aux"
library.

3 files changed, 14 insertions, 14 deletions

diff --git a/tools/check-docs.sh b/tools/check-docs.sh
index a7526fcb45..c2e6761d0d 100755
--- a/tools/check-docs.sh
+++ b/tools/check-docs.sh
@@ -23,15 +23,15 @@ same_lines() {
 
 libnm_headers() {
     (
-        ls -1 "$1/libnm"/*.h "$1/src/libnm-core-public"/*.h | \
+        ls -1 "$1/src/libnm-client-public"/*.h "$1/src/libnm-core-public"/*.h | \
         if [ -n "$2" ]; then
-            grep -v -F "$1/libnm-core/nm-core-enum-types.h" | \
-            grep -v -F "$1/libnm/nm-enum-types.h"
+            grep -v -F "$1/src/libnm-core-public/nm-core-enum-types.h" | \
+            grep -v -F "$1/src/libnm-client-public/nm-enum-types.h"
         else
             cat
         fi
         if [ -n "$2" ]; then
-            ls -1 "$2/libnm"/*.h "$2/src/libnm-core-public"/*.h
+            ls -1 "$2/src/libnm-client-public"/*.h "$2/src/libnm-core-public"/*.h
         fi
     ) | sort | uniq
 }
@@ -63,7 +63,7 @@ F1_EXTRA="
 nm-core-enum-types
 nm-enum-types
 "
-F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/libnm/libnm.ver" | word_regex)" \
+F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/src/libnm-client-impl/libnm.ver" | word_regex)" \
            $(libnm_headers "$SOURCEDIR" "$BUILDDIR") \
       | sed 's,.*/\([^/]\+\)\.h$,\1,')"
 F2_EXTRA="
diff --git a/tools/check-tree.sh b/tools/check-tree.sh
index f08a8da613..1975b0931b 100755
--- a/tools/check-tree.sh
+++ b/tools/check-tree.sh
@@ -19,6 +19,6 @@ check_cmp() {
     die "files \"$a\" and \"$b\" differ!"
 }
 
-check_cmp src/libnm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
+check_cmp src/libnm-base/nm-ethtool-utils-base.h src/libnm-client-public/nm-ethtool-utils.h
 check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h
 check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 6d835a8fb8..81b94ec648 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -216,8 +216,8 @@ else
                 BUILDDIR="$(dirname "$BUILDDIR")"
                 [[ "$BUILDDIR" == / ]] && BUILDDIR=
                 [[ -z "$BUILDDIR" ]] && break
-                [[ -e "$BUILDDIR/libnm/.libs/libnm.so" ]] && break
-                [[ -e "$BUILDDIR/libnm/libnm.so" ]] && break
+                [[ -e "$BUILDDIR/src/libnm-client-impl/.libs/libnm.so" ]] && break
+                [[ -e "$BUILDDIR/src/libnm-client-impl/libnm.so" ]] && break
             done
         fi
     fi
@@ -244,7 +244,7 @@ TEST_NAME="${TEST##*/}"
 
 if [ -z "${NMTST_LAUNCH_DBUS}" ]; then
     # autodetect whether to launch D-Bus based on the test path.
-    if [[ $TEST_PATH == */libnm/tests ]]; then
+    if [[ $TEST_PATH == */src/libnm-client-impl/tests ]]; then
         NMTST_LAUNCH_DBUS=1
     else
         NMTST_LAUNCH_DBUS=0
@@ -270,12 +270,12 @@ fi
 [ -x "$TEST" ] || die "Cannot execute test \"$TEST\""
 
 if [[ -n "$BUILDDIR" ]]; then
-    if [[ -d "$BUILDDIR/libnm" ]]; then
-        export GI_TYPELIB_PATH="$BUILDDIR/libnm/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
-        if [[ -d "$BUILDDIR/libnm/.libs" ]]; then
-            export LD_LIBRARY_PATH="$BUILDDIR/libnm/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+    if [[ -d "$BUILDDIR/src/libnm-client-impl" ]]; then
+        export GI_TYPELIB_PATH="$BUILDDIR/src/libnm-client-impl/${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+        if [[ -d "$BUILDDIR/src/libnm-client-impl/.libs" ]]; then
+            export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
         else
-            export LD_LIBRARY_PATH="$BUILDDIR/libnm${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+            export LD_LIBRARY_PATH="$BUILDDIR/src/libnm-client-impl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
         fi
     fi
 fi