From bbbf9ad37b295282125d5ea78044d06e74d6b116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Wed, 1 Aug 2012 21:48:45 +0200 Subject: [PATCH] distro: remove src/backends It is no longer used. Also remove an obsolete comment about backends in nm-system.h. --- configure.ac | 1 - src/Makefile.am | 2 - src/backends/Makefile.am | 85 ------------------------- src/backends/NetworkManagerArch.c | 39 ------------ src/backends/NetworkManagerDebian.c | 33 ---------- src/backends/NetworkManagerExherbo.c | 32 ---------- src/backends/NetworkManagerFrugalware.c | 27 -------- src/backends/NetworkManagerGeneric.c | 46 ------------- src/backends/NetworkManagerGeneric.h | 29 --------- src/backends/NetworkManagerGentoo.c | 34 ---------- src/backends/NetworkManagerLFS.c | 34 ---------- src/backends/NetworkManagerLinexa.c | 33 ---------- src/backends/NetworkManagerMandriva.c | 29 --------- src/backends/NetworkManagerPaldo.c | 31 --------- src/backends/NetworkManagerPardus.c | 27 -------- src/backends/NetworkManagerRedHat.c | 27 -------- src/backends/NetworkManagerSlackware.c | 27 -------- src/backends/NetworkManagerSuSE.c | 32 ---------- src/backends/nm-backend.h | 26 -------- src/generated/Makefile.am | 2 - src/nm-system.h | 4 -- 21 files changed, 600 deletions(-) delete mode 100644 src/backends/Makefile.am delete mode 100644 src/backends/NetworkManagerArch.c delete mode 100644 src/backends/NetworkManagerDebian.c delete mode 100644 src/backends/NetworkManagerExherbo.c delete mode 100644 src/backends/NetworkManagerFrugalware.c delete mode 100644 src/backends/NetworkManagerGeneric.c delete mode 100644 src/backends/NetworkManagerGeneric.h delete mode 100644 src/backends/NetworkManagerGentoo.c delete mode 100644 src/backends/NetworkManagerLFS.c delete mode 100644 src/backends/NetworkManagerLinexa.c delete mode 100644 src/backends/NetworkManagerMandriva.c delete mode 100644 src/backends/NetworkManagerPaldo.c delete mode 100644 src/backends/NetworkManagerPardus.c delete mode 100644 src/backends/NetworkManagerRedHat.c delete mode 100644 src/backends/NetworkManagerSlackware.c delete mode 100644 src/backends/NetworkManagerSuSE.c delete mode 100644 src/backends/nm-backend.h diff --git a/configure.ac b/configure.ac index 903c61e474..46640b1bdf 100644 --- a/configure.ac +++ b/configure.ac @@ -778,7 +778,6 @@ src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile -src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 0f2d2dd114..b155209cb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS= \ ip6-manager \ supplicant-manager \ ppp-manager \ - backends \ dnsmasq-manager \ modem-manager \ bluez-manager \ @@ -321,7 +320,6 @@ NetworkManager_LDADD = \ ./wifi/libwifi-utils.la \ ./firewall-manager/libfirewall-manager.la \ ./settings/libsettings.la \ - ./backends/libnmbackend.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am deleted file mode 100644 index 647e5e5b34..0000000000 --- a/src/backends/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -INCLUDES = \ - -I${top_srcdir} \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src \ - -I${top_srcdir}/libnm-util - -noinst_LTLIBRARIES = libnmbackend.la - -libnmbackend_la_SOURCES = \ - NetworkManagerGeneric.c \ - NetworkManagerGeneric.h \ - nm-backend.h - -libnmbackend_la_LIBADD = - -if TARGET_REDHAT -libnmbackend_la_SOURCES += NetworkManagerRedHat.c -endif - -if TARGET_SUSE -libnmbackend_la_SOURCES += NetworkManagerSuSE.c -endif - -if TARGET_GENTOO -libnmbackend_la_SOURCES += NetworkManagerGentoo.c -endif - -if TARGET_DEBIAN -libnmbackend_la_SOURCES += NetworkManagerDebian.c -endif - -if TARGET_SLACKWARE -libnmbackend_la_SOURCES += NetworkManagerSlackware.c -endif - -if TARGET_ARCH -libnmbackend_la_SOURCES += NetworkManagerArch.c -endif - -if TARGET_PALDO -libnmbackend_la_SOURCES += NetworkManagerPaldo.c -endif - -if TARGET_FRUGALWARE -libnmbackend_la_SOURCES += NetworkManagerFrugalware.c -libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil -endif - -if TARGET_MANDRIVA -libnmbackend_la_SOURCES += NetworkManagerMandriva.c -endif - -if TARGET_PARDUS -libnmbackend_la_SOURCES += NetworkManagerPardus.c -endif - -if TARGET_LINEXA -libnmbackend_la_SOURCES += NetworkManagerLinexa.c -endif - -if TARGET_EXHERBO -libnmbackend_la_SOURCES += NetworkManagerExherbo.c -endif - -if TARGET_LFS -libnmbackend_la_SOURCES += NetworkManagerLFS.c -endif - -libnmbackend_la_LIBADD += \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -libnmbackend_la_CPPFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" - diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c deleted file mode 100644 index bbf3da4993..0000000000 --- a/src/backends/NetworkManagerArch.c +++ /dev/null @@ -1,39 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Backend implementation for the Arch Linux distribution http://www.archlinux.org - * - * Tor Krill and Will Rea - * - * Updated by Wael Nasreddine - * - * Updated by Valentine Sinitsyn - * - * Heavily based on NetworkManagerDebian.c by Matthew Garrett - * - * Heavily based on NetworkManagerRedhat.c by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 Tom Parker - * (C) Copyright 2004 Matthew Garrett - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c deleted file mode 100644 index 6cae443451..0000000000 --- a/src/backends/NetworkManagerDebian.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Matthew Garrett - * - * Heavily based on NetworkManagerRedhat.c by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 Tom Parker - * (C) Copyright 2004 Matthew Garrett - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c deleted file mode 100644 index 55ee553b23..0000000000 --- a/src/backends/NetworkManagerExherbo.c +++ /dev/null @@ -1,32 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams - * Dan Willemsen - * Robert Paskowitz - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2004 Dan Willemsen - * (C) Copyright 2004 Robert Paskowitz - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c deleted file mode 100644 index 3e1fea2324..0000000000 --- a/src/backends/NetworkManagerFrugalware.c +++ /dev/null @@ -1,27 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Implementation for the Frugalware Linux distro - http://www.frugalware.org - * - * Alex Smith - * - * Based on NetworkManagerSlackware.c by Narayan Newton - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2006 Alex Smith - */ - -/* Provided by the frugalwareutils package on Frugalware */ -#include diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c deleted file mode 100644 index 6e729ad16f..0000000000 --- a/src/backends/NetworkManagerGeneric.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2006 Timothee Lecomte - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include "NetworkManagerGeneric.h" -#include "nm-system.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" -#include "nm-netlink-compat.h" -#include "nm-netlink-monitor.h" -#include "nm-netlink-utils.h" - -/* Because of a bug in libnl, rtnl.h should be included before route.h */ -#include - -#include -#include - diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h deleted file mode 100644 index 0412a27dcb..0000000000 --- a/src/backends/NetworkManagerGeneric.h +++ /dev/null @@ -1,29 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Timothee Lecomte - * - * Heavily based on NetworkManagerSystem.h by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifndef NM_GENERIC_H -#define NM_GENERIC_H - -#include "nm-backend.h" - -#endif /* NM_GENERIC_H */ diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c deleted file mode 100644 index bde272d1cc..0000000000 --- a/src/backends/NetworkManagerGentoo.c +++ /dev/null @@ -1,34 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams - * Dan Willemsen - * Robert Paskowitz - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2004 Dan Willemsen - * (C) Copyright 2004 Robert Paskowitz - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/NetworkManagerLFS.c b/src/backends/NetworkManagerLFS.c deleted file mode 100644 index 54f72815f3..0000000000 --- a/src/backends/NetworkManagerLFS.c +++ /dev/null @@ -1,34 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Backend implementation for the Linux From Scratch http://www.linuxfromscratch.org/ - * - * Wayne Blaszczyk - * Armin K. - * - * Heavily based on NetworkManagerRedhat.c by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 Tom Parker - * (C) Copyright 2004 Matthew Garrett - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" diff --git a/src/backends/NetworkManagerLinexa.c b/src/backends/NetworkManagerLinexa.c deleted file mode 100644 index 6cae443451..0000000000 --- a/src/backends/NetworkManagerLinexa.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Matthew Garrett - * - * Heavily based on NetworkManagerRedhat.c by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 Tom Parker - * (C) Copyright 2004 Matthew Garrett - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c deleted file mode 100644 index 5a665154c6..0000000000 --- a/src/backends/NetworkManagerMandriva.c +++ /dev/null @@ -1,29 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams - * Per Øyvind Karlsen - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2008 Per Øyvind Karlsen - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c deleted file mode 100644 index 538cb8f394..0000000000 --- a/src/backends/NetworkManagerPaldo.c +++ /dev/null @@ -1,31 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Jürg Billeter - * - * Heavily based on NetworkManagerRedhat.c by Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2006 Jürg Billeter - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/NetworkManagerPardus.c b/src/backends/NetworkManagerPardus.c deleted file mode 100644 index fb5732dba2..0000000000 --- a/src/backends/NetworkManagerPardus.c +++ /dev/null @@ -1,27 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Ozan Caglayan - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 RedHat, Inc. - * (C) Copyright 2009 TUBITAK/UEKAE - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c deleted file mode 100644 index 7c4a851888..0000000000 --- a/src/backends/NetworkManagerRedHat.c +++ /dev/null @@ -1,27 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c deleted file mode 100644 index b8a631b3f3..0000000000 --- a/src/backends/NetworkManagerSlackware.c +++ /dev/null @@ -1,27 +0,0 @@ -/* NetworkManager -- Network link manager - * - * Narayan Newton - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 RedHat, Inc. - * (C) Copyright 2004 Narayan Newton - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c deleted file mode 100644 index 4042e62a70..0000000000 --- a/src/backends/NetworkManagerSuSE.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * NetworkManager -- Network link manager - * - * Dan Williams - * Kay Sievers - * Robert Love - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2004 - 2012 Red Hat, Inc. - * (C) Copyright 2005-2006 SuSE GmbH - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "NetworkManagerGeneric.h" -#include "NetworkManagerUtils.h" -#include "nm-logging.h" diff --git a/src/backends/nm-backend.h b/src/backends/nm-backend.h deleted file mode 100644 index 34750d2d2e..0000000000 --- a/src/backends/nm-backend.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2011 - 2012 Red Hat, Inc. - */ - -#ifndef NM_BACKEND_H -#define NM_BACKEND_H - -/* Random disto-specific stuff */ - -#endif /* NM_BACKEND_H */ diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index 252973cda1..7332644647 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -16,7 +16,6 @@ nm_daemon_all_sources = \ $(top_srcdir)/src/dhcp-manager/*.[ch] \ $(top_srcdir)/src/ip6-manager/*.[ch] \ $(top_srcdir)/src/supplicant-manager/*.[ch] \ - $(top_srcdir)/src/backends/*.[ch] \ $(top_srcdir)/src/ppp-manager/*.[ch] \ $(top_srcdir)/src/dnsmasq-manager/*.[ch] \ $(top_srcdir)/src/modem-manager/*.[ch] \ @@ -49,7 +48,6 @@ INCLUDES = \ -I${top_srcdir}/src/dhcp-manager \ -I${top_srcdir}/src/ip6-manager \ -I${top_srcdir}/src/supplicant-manager \ - -I${top_srcdir}/src/backends \ -I${top_srcdir}/src/ppp-manager \ -I${top_srcdir}/src/dnsmasq-manager \ -I${top_srcdir}/src/modem-manager \ diff --git a/src/nm-system.h b/src/nm-system.h index 1acb885389..102d116b78 100644 --- a/src/nm-system.h +++ b/src/nm-system.h @@ -33,10 +33,6 @@ #include "nm-setting-bond.h" #include "nm-setting-vlan.h" -/* Prototypes for system/distribution dependent functions, - * implemented in the backend files in backends/ directory - */ - gboolean nm_system_iface_flush_routes (int ifindex, int family); gboolean nm_system_replace_default_ip4_route (int ifindex,