[network-manager-sstp] Fixing up compile target for auth-dialog
- From: Eivind Næss <eivnaes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-sstp] Fixing up compile target for auth-dialog
- Date: Sun, 20 Mar 2022 21:05:17 +0000 (UTC)
commit 3d4cc5c16221f8b34013d857f11c2f6fa5fdb212
Author: Eivind Næss <eivnaes yahoo com>
Date: Sat Mar 19 13:53:22 2022 -0700
Fixing up compile target for auth-dialog
Signed-off-by: Eivind Næss <eivnaes yahoo com>
Makefile.am | 4 ----
auth-dialog/main.c | 2 --
shared/nm-default.h | 7 +++++++
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 44bf9da..63953e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -251,10 +251,6 @@ endif
auth_dialog_nm_sstp_auth_dialog_SOURCES = \
$(shared_sources) \
- shared/utils.c \
- shared/utils.h \
- properties/resources.c \
- properties/resources.h \
auth-dialog/main.c
auth_dialog_nm_sstp_auth_dialog_CFLAGS = \
$(GLIB_CFLAGS) \
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 6086440..cb070ae 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -30,8 +30,6 @@
#include <nma-vpn-password-dialog.h>
-#include "utils.h"
-
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
#define KEYRING_SK_TAG "setting-key"
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 58c329e..3df230c 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -29,6 +29,13 @@
#define NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR 0x0004
#define NM_NETWORKMANAGER_COMPILATION_LIB (0x0002 | 0x0004)
+#ifndef NETWORKMANAGER_COMPILATION
+/* For convenience, we don't require our Makefile.am to define
+ * -DNETWORKMANAGER_COMPILATION. As we now include this internal header,
+ * we know we do a NETWORKMANAGER_COMPILATION. */
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DEFAULT
+#endif
+
/* special flag, to indicate that we build a legacy library. That is, we link against
* deprecated libnm-util/libnm-glib instead against libnm. */
#define NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL 0x0010
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]