Imported Upstream version 1.1.90

6 files changed, 48 insertions, 54 deletions

diff --git a/icons/16/Makefile.in b/icons/16/Makefile.in
index 3c2ab918..46f8930f 100644
--- a/icons/16/Makefile.in
+++ b/icons/16/Makefile.in
@@ -157,6 +157,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -171,9 +173,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,10 +195,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -229,6 +228,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -243,8 +246,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -253,8 +254,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
diff --git a/icons/22/Makefile.in b/icons/22/Makefile.in
index f5c032a6..a900233e 100644
--- a/icons/22/Makefile.in
+++ b/icons/22/Makefile.in
@@ -157,6 +157,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -171,9 +173,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,10 +195,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -229,6 +228,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -243,8 +246,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -253,8 +254,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
diff --git a/icons/32/Makefile.in b/icons/32/Makefile.in
index 1efc8bd3..3b73ca9f 100644
--- a/icons/32/Makefile.in
+++ b/icons/32/Makefile.in
@@ -157,6 +157,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -171,9 +173,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,10 +195,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -229,6 +228,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -243,8 +246,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -253,8 +254,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
diff --git a/icons/48/Makefile.in b/icons/48/Makefile.in
index 2718e69b..3911597d 100644
--- a/icons/48/Makefile.in
+++ b/icons/48/Makefile.in
@@ -157,6 +157,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -171,9 +173,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,10 +195,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -229,6 +228,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -243,8 +246,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -253,8 +254,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 78820c5a..10d03b4a 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -187,6 +187,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -201,9 +203,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -222,10 +225,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -259,6 +258,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -273,8 +276,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -283,8 +284,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in
index ab6ec4aa..649fada3 100644
--- a/icons/scalable/Makefile.in
+++ b/icons/scalable/Makefile.in
@@ -157,6 +157,8 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
+APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -171,9 +173,10 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,10 +195,6 @@ GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_BLUETOOTH_CFLAGS = @GNOME_BLUETOOTH_CFLAGS@
-GNOME_BLUETOOTH_LIBS = @GNOME_BLUETOOTH_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_LIBS = @GOBJECT_LIBS@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -229,6 +228,10 @@ ISO_CODES_CFLAGS = @ISO_CODES_CFLAGS@
 ISO_CODES_LIBS = @ISO_CODES_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBNM_CFLAGS = @LIBNM_CFLAGS@
+LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
+LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
+LIBNM_LIBS = @LIBNM_LIBS@
 LIBNOTIFY_07_CFLAGS = @LIBNOTIFY_07_CFLAGS@
 LIBNOTIFY_07_LIBS = @LIBNOTIFY_07_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -243,8 +246,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATION_CFLAGS = @MIGRATION_CFLAGS@
-MIGRATION_LIBS = @MIGRATION_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@
@@ -253,8 +254,6 @@ MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
-NMA_CFLAGS = @NMA_CFLAGS@
-NMA_LIBS = @NMA_LIBS@
 NMEDIT = @NMEDIT@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@