NetworkManager r3988 - in trunk: . test test/test-common

[dcbw svn gnome org]

Author: dcbw
Date: Tue Aug 19 13:49:39 2008
New Revision: 3988
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3988&view=rev

Log:
2008-08-19  Dan Williams  <dcbw redhat com>

	* configure.in
	  test/Makefile.am
		- Don't build test/test-common
		- Remove unused stuff

	* test/nm-set-fallback
	  test/nmtestdevices.c
	  test/test-common/.cvsignore
	  test/test-common/Makefile.am
	  test/test-common/test-common.c
	  test/test-common/test-common.h
		- delete



Removed:
   trunk/test/nm-set-fallback
   trunk/test/nmtestdevices.c
   trunk/test/test-common/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/test/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug 19 13:49:39 2008
@@ -438,7 +438,6 @@
 system-settings/plugins/ifcfg-suse/Makefile
 system-settings/plugins/keyfile/Makefile
 test/Makefile
-test/test-common/Makefile
 initscript/Makefile
 initscript/RedHat/Makefile
 initscript/RedHat/NetworkManager

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	(original)
+++ trunk/test/Makefile.am	Tue Aug 19 13:49:39 2008
@@ -1,5 +1,3 @@
-SUBDIRS=test-common
-
 INCLUDES = -I${top_srcdir}                    \
            -I${top_srcdir}/libnm-util         \
            -I${top_srcdir}/libnm-glib         \
@@ -17,9 +15,7 @@
 
 bin_PROGRAMS = nm-tool
 
-noinst_PROGRAMS = nm-online \
-                  nmtestdevices \
-                  libnm_glib_test
+noinst_PROGRAMS = nm-online libnm_glib_test
 
 nm_tool_SOURCES = nm-tool.c
 nm_tool_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
@@ -30,10 +26,6 @@
 nm_online_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
 		$(top_builddir)/libnm-util/libnm-util.la
 
-nmtestdevices_SOURCES = nmtestdevices.c
-nmtestdevices_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS)	\
-			$(top_builddir)/libnm-util/libnm-util.la
-
 libnm_glib_test_SOURCES = libnm_glib_test.c
 libnm_glib_test_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) \
 			$(top_builddir)/libnm-glib/libnm_glib.la \