build: separate compilation macro for libnm-util and libnm-glib

Set different defines for building libnm and legacy libnm-glib.

diff --git a/include/nm-default.h b/include/nm-default.h
index 70069a9..045ad8d 100644 (file)
--- a/include/nm-default.h
+++ b/include/nm-default.h
@@ -28,6 +28,7 @@
 #define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON       0x0002
 #define NM_NETWORKMANAGER_COMPILATION_LIB                 0x0004
 #define NM_NETWORKMANAGER_COMPILATION_SYSTEMD             0x0008
+#define NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY          0x0010
 
 #ifndef NETWORKMANAGER_COMPILATION
 /* For convenience, we don't require our Makefile.am to define
@@ -46,7 +47,7 @@
 
 /*****************************************************************************/
 
-#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB
+#if ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB) || ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
 
 #include <glib/gi18n-lib.h>
 
@@ -54,7 +55,7 @@
 
 #include <glib/gi18n.h>
 
-#endif /* NM_NETWORKMANAGER_COMPILATION_LIB */
+#endif /* NM_NETWORKMANAGER_COMPILATION_LIB || NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY */
 
 /*****************************************************************************/
 

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 53d5669..7a815ee 100644 (file)
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""libnm-glib"\" \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS)

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 29c83f0..4c08b94 100644 (file)
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/include \
        -DG_LOG_DOMAIN=\""libnm-util"\" \
        -DLOCALEDIR=\"$(datadir)/locale\" \
-       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(GLIB_CFLAGS) \
        $(DBUS_CFLAGS) \