summaryrefslogtreecommitdiff
path: root/libnm-util
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-12-22 12:18:22 +0100
committerThomas Haller <thaller@redhat.com>2015-12-24 11:42:37 +0100
commitdb80ec05abdc09541896d80bdf71ccec58670109 (patch)
tree7ba6a34d1b2448e06146e11d9417a7b79f5bd5fb /libnm-util
parentbc06dd9332f557fb1848b3c50a102e0d35ad9205 (diff)
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".
Diffstat (limited to 'libnm-util')
-rw-r--r--libnm-util/Makefile.am6
-rw-r--r--libnm-util/tests/Makefile.am4
2 files changed, 5 insertions, 5 deletions
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 4c08b9405..6e6379081 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = . tests
AM_CPPFLAGS = \
-I${top_srcdir} \
- -I${top_srcdir}/include \
- -I$(top_builddir)/include \
+ -I${top_srcdir}/shared \
+ -I$(top_builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
@@ -25,7 +25,7 @@ endif
lib_LTLIBRARIES=libnm-util.la
libnm_util_include_HEADERS = \
- $(top_builddir)/include/nm-version-macros.h \
+ $(top_builddir)/shared/nm-version-macros.h \
NetworkManager.h \
NetworkManagerVPN.h \
nm-connection.h \
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index e580a1348..eda212ed8 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -1,8 +1,8 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/include \
+ -I$(top_srcdir)/shared \
+ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \