colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: add libnm/libnm-core (part 2)

Browse Source 
This fixes up the code from the previous "clean" import, and adds
build infrastructure.

[There are two slightly orthogonal sets of changes in this patch.
First, the files added in the previous commit were modified as followed:

  # Replace internal references to "libnm-util" and "libnm-glib" with "libnm"
  perl -pi -e 's/libnm-(util|glib)/libnm/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch]

  # Fix includes of the enum-types files
  perl -pi -e 's/nm-utils-enum-types/nm-core-enum-types/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch]
  perl -pi -e 's/nm-glib-enum-types/nm-enum-types/;' libnm/*.[ch] libnm/tests/*.[ch]

  # Fix some python example code
  perl -pi -e 's/import NMClient/import NM/;' -e 's/NMClient.Client\(\)/NM.Client()/;' libnm/nm-client.c

Then, the build infrastructure was added (without further modifying
any existing files in libnm-core or libnm.)

Note: to regenerate libnm.ver after rebase:
  (head -2 libnm-util/libnm-util.ver; (grep -h '\s'nm_ libnm-util/libnm-util.ver libnm-glib/libnm-glib.ver | env LANG=C sort); tail -3 libnm-util/libnm-util.ver) > libnm/libnm.ver
]
This commit is contained in:
Dan Winship
2014-07-04 13:26:57 -04:00
parent d595f7843e
commit eedcf185a7
31 changed files with 1619 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-core/NetworkManager.h
View File

@@ -19,8 +19,8 @@
/* Definitions related to NetworkManager's D-Bus interfaces.
*
* Note that although this header is installed as part of libnm-util, it is also
* used by some external code that does not link to libnm-util.
* Note that although this header is installed as part of libnm, it is also
* used by some external code that does not link to libnm.
*/
#ifndef NETWORK_MANAGER_H