Imported Upstream version 1.0.0 upstream/1.0.0

3 files changed, 16 insertions, 27 deletions

diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index cf351d61..e6fe1369 100644
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -1,20 +1,15 @@
 AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/posix-signals \
-	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
 	-I${srcdir}/.. \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(POLKIT_CFLAGS) \
-	$(LIBNL_CFLAGS) \
 	$(LIBNDP_CFLAGS)
 
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
@@ -31,6 +26,5 @@ noinst_PROGRAMS = \
 rdisc_SOURCES = \
 	rdisc.c
 rdisc_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la \
-	$(LIBNDP_LIBS)
+	$(top_builddir)/src/libNetworkManager.la
 
diff --git a/src/rdisc/tests/Makefile.in b/src/rdisc/tests/Makefile.in
index 97ade88f..b2ea3c74 100644
--- a/src/rdisc/tests/Makefile.in
+++ b/src/rdisc/tests/Makefile.in
@@ -105,9 +105,7 @@ CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_rdisc_OBJECTS = rdisc.$(OBJEXT)
 rdisc_OBJECTS = $(am_rdisc_OBJECTS)
-am__DEPENDENCIES_1 =
-rdisc_DEPENDENCIES = $(top_builddir)/src/libNetworkManager.la \
-	$(am__DEPENDENCIES_1)
+rdisc_DEPENDENCIES = $(top_builddir)/src/libNetworkManager.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -182,6 +180,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
+BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -305,6 +305,7 @@ NEWT_CFLAGS = @NEWT_CFLAGS@
 NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -324,6 +325,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -350,7 +352,7 @@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
+UDEV_DIR = @UDEV_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
@@ -432,20 +434,15 @@ with_valgrind = @with_valgrind@
 AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/posix-signals \
-	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
 	-I${srcdir}/.. \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(POLKIT_CFLAGS) \
-	$(LIBNL_CFLAGS) \
 	$(LIBNDP_CFLAGS)
 
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
@@ -458,8 +455,7 @@ rdisc_SOURCES = \
 	rdisc.c
 
 rdisc_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la \
-	$(LIBNDP_LIBS)
+	$(top_builddir)/src/libNetworkManager.la
 
 all: all-am
 
diff --git a/src/rdisc/tests/rdisc.c b/src/rdisc/tests/rdisc.c
index 1fdf5b67..d577a63a 100644
--- a/src/rdisc/tests/rdisc.c
+++ b/src/rdisc/tests/rdisc.c
@@ -18,6 +18,8 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <syslog.h>
 
@@ -37,7 +39,6 @@ main (int argc, char **argv)
 	NMRDisc *(*new) (int ifindex, const char *ifname);
 	int ifindex = 1;
 	const char *ifname;
-	char mac[6] = { 0x02, 0xaa, 0xbb, 0xcc, 0xdd, 0xee };
 
 #if !GLIB_CHECK_VERSION (2, 35, 0)
 	g_type_init ();
@@ -69,8 +70,6 @@ main (int argc, char **argv)
 	if (!rdisc)
 		return EXIT_FAILURE;
 
-	nm_rdisc_set_lladdr (rdisc, mac, 6);
-
 	nm_rdisc_start (rdisc);
 	g_main_loop_run (loop);