From 182945eeab798392e097a92e2666130fe7e750cd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 30 Jan 2008 21:28:26 +0000 Subject: [PATCH] 2008-01-30 Dan Williams * system-settings/plugins/ifcfg * system-settings/plugins/ifcfg-fedora - Move the ifcfg plugin to ifcfg-fedora git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3278 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ configure.in | 2 +- system-settings/plugins/Makefile.am | 2 +- .../plugins/{ifcfg => ifcfg-fedora}/Makefile.am | 10 +++++----- .../plugins/{ifcfg => ifcfg-fedora}/parser.c | 0 .../plugins/{ifcfg => ifcfg-fedora}/parser.h | 0 .../plugins/{ifcfg => ifcfg-fedora}/plugin.c | 0 .../plugins/{ifcfg => ifcfg-fedora}/plugin.h | 0 .../plugins/{ifcfg => ifcfg-fedora}/shvar.c | 0 .../plugins/{ifcfg => ifcfg-fedora}/shvar.h | 0 10 files changed, 13 insertions(+), 7 deletions(-) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/Makefile.am (56%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/parser.c (100%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/parser.h (100%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/plugin.c (100%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/plugin.h (100%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/shvar.c (100%) rename system-settings/plugins/{ifcfg => ifcfg-fedora}/shvar.h (100%) diff --git a/ChangeLog b/ChangeLog index edf3ddfc17..f242ba6916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-30 Dan Williams + + * system-settings/plugins/ifcfg + * system-settings/plugins/ifcfg-fedora + - Move the ifcfg plugin to ifcfg-fedora + 2008-01-24 Dan Williams * libnm-glib/nm-device-802-11-wireless.c diff --git a/configure.in b/configure.in index f64d4b542f..f300d559c7 100644 --- a/configure.in +++ b/configure.in @@ -277,7 +277,7 @@ dispatcher-daemon/Makefile system-settings/Makefile system-settings/src/Makefile system-settings/plugins/Makefile -system-settings/plugins/ifcfg/Makefile +system-settings/plugins/ifcfg-fedora/Makefile test/Makefile test/test-common/Makefile initscript/Makefile diff --git a/system-settings/plugins/Makefile.am b/system-settings/plugins/Makefile.am index a0eb4d9e4e..4f09e2c355 100644 --- a/system-settings/plugins/Makefile.am +++ b/system-settings/plugins/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS=ifcfg +SUBDIRS=ifcfg-fedora diff --git a/system-settings/plugins/ifcfg/Makefile.am b/system-settings/plugins/ifcfg-fedora/Makefile.am similarity index 56% rename from system-settings/plugins/ifcfg/Makefile.am rename to system-settings/plugins/ifcfg-fedora/Makefile.am index 0ae42befab..ab00fbb0c0 100644 --- a/system-settings/plugins/ifcfg/Makefile.am +++ b/system-settings/plugins/ifcfg-fedora/Makefile.am @@ -1,7 +1,7 @@ -pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la +pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg-fedora.la -libnm_settings_plugin_ifcfg_la_SOURCES = \ +libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \ shvar.c \ shvar.h \ parser.c \ @@ -9,7 +9,7 @@ libnm_settings_plugin_ifcfg_la_SOURCES = \ plugin.c \ plugin.h -libnm_settings_plugin_ifcfg_la_CPPFLAGS = \ +libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -19,8 +19,8 @@ libnm_settings_plugin_ifcfg_la_CPPFLAGS = \ -I$(top_srcdir)/libnm-util \ -DSYSCONFDIR=\"$(sysconfdir)\" -libnm_settings_plugin_ifcfg_la_LDFLAGS = -module -avoid-version -libnm_settings_plugin_ifcfg_la_LIBADD = \ +libnm_settings_plugin_ifcfg_fedora_la_LDFLAGS = -module -avoid-version +libnm_settings_plugin_ifcfg_fedora_la_LIBADD = \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(top_builddir)/libnm-util/libnm-util.la diff --git a/system-settings/plugins/ifcfg/parser.c b/system-settings/plugins/ifcfg-fedora/parser.c similarity index 100% rename from system-settings/plugins/ifcfg/parser.c rename to system-settings/plugins/ifcfg-fedora/parser.c diff --git a/system-settings/plugins/ifcfg/parser.h b/system-settings/plugins/ifcfg-fedora/parser.h similarity index 100% rename from system-settings/plugins/ifcfg/parser.h rename to system-settings/plugins/ifcfg-fedora/parser.h diff --git a/system-settings/plugins/ifcfg/plugin.c b/system-settings/plugins/ifcfg-fedora/plugin.c similarity index 100% rename from system-settings/plugins/ifcfg/plugin.c rename to system-settings/plugins/ifcfg-fedora/plugin.c diff --git a/system-settings/plugins/ifcfg/plugin.h b/system-settings/plugins/ifcfg-fedora/plugin.h similarity index 100% rename from system-settings/plugins/ifcfg/plugin.h rename to system-settings/plugins/ifcfg-fedora/plugin.h diff --git a/system-settings/plugins/ifcfg/shvar.c b/system-settings/plugins/ifcfg-fedora/shvar.c similarity index 100% rename from system-settings/plugins/ifcfg/shvar.c rename to system-settings/plugins/ifcfg-fedora/shvar.c diff --git a/system-settings/plugins/ifcfg/shvar.h b/system-settings/plugins/ifcfg-fedora/shvar.h similarity index 100% rename from system-settings/plugins/ifcfg/shvar.h rename to system-settings/plugins/ifcfg-fedora/shvar.h