fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 09:38:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/clients/Makefile.am

23 lines
459 B
Text
Raw Normal View History

clients: reorganize source tree, put all the installed clients together Create a new clients/ subdirectory at the top level, and move cli/ and tui/ into it, as well as nm-online.c (which was previously in test/, which made no sense). cli/ was split into two subdirectories, src/ and completion/. While this does simplify things (given that the completion file and the binary both need to be named "nmcli"), it bloats the source tree, and we can work around it by just renaming the completion file at install time. Then we can combine the two directories into one and just have it all under clients/cli/.
2014-07-22 17:55:13 -04:00
SUBDIRS = cli tui
AM_CPPFLAGS = \
build: rename directory "include" to "shared" Up to now, the "include" directory contained (only) header files that were used project-wide by libs, core, clients, et al. Since the directory now also contains a non-header file, the "include" name is misleading. Instead of adding yet another directory that is project-wide, with non-header-only content, rename the "include" directory to "shared".
2015-12-22 12:18:22 +01:00
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
all: port everything to libnm Since the API has not changed at this point, this is mostly just a matter of updating Makefiles, and changing references to the library name in comments. NetworkManager cannot link to libnm due to the duplicated type/symbol names. So it links to libnm-core.la directly, which means that NetworkManager gets a separate copy of that code from libnm.so. Everything else links to libnm.
2014-05-19 13:44:02 -04:00
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \
-I${top_builddir}/libnm \
clients: reorganize source tree, put all the installed clients together Create a new clients/ subdirectory at the top level, and move cli/ and tui/ into it, as well as nm-online.c (which was previously in test/, which made no sense). cli/ was split into two subdirectories, src/ and completion/. While this does simplify things (given that the completion file and the binary both need to be named "nmcli"), it bloats the source tree, and we can work around it by just renaming the completion file at install time. Then we can combine the two directories into one and just have it all under clients/cli/.
2014-07-22 17:55:13 -04:00
$(GLIB_CFLAGS) \
-DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = nm-online
nm_online_SOURCES = nm-online.c
nm_online_CPPFLAGS = \
-DG_LOG_DOMAIN=\""nm-online"\" \
$(AM_CPPFLAGS)
nm_online_LDADD = \
all: port everything to libnm Since the API has not changed at this point, this is mostly just a matter of updating Makefiles, and changing references to the library name in comments. NetworkManager cannot link to libnm due to the duplicated type/symbol names. So it links to libnm-core.la directly, which means that NetworkManager gets a separate copy of that code from libnm.so. Everything else links to libnm.
2014-05-19 13:44:02 -04:00
$(top_builddir)/libnm/libnm.la \
clients: reorganize source tree, put all the installed clients together Create a new clients/ subdirectory at the top level, and move cli/ and tui/ into it, as well as nm-online.c (which was previously in test/, which made no sense). cli/ was split into two subdirectories, src/ and completion/. While this does simplify things (given that the completion file and the binary both need to be named "nmcli"), it bloats the source tree, and we can work around it by just renaming the completion file at install time. Then we can combine the two directories into one and just have it all under clients/cli/.
2014-07-22 17:55:13 -04:00
$(GLIB_LIBS)
Reference in a new issue Copy permalink