From d99d3d98e08720451707ddb344b04e6ef8f1ee09 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 24 Aug 2006 14:29:11 +0000 Subject: [PATCH] 2006-08-24 Dan Williams * configure.in src/Makefile.am src/supplicant-manager/Makefile.am src/supplicant-manager/nm-supplicant-manager.c src/supplicant-manager/nm-supplicant-manager.h - Add skeleton bits of the wpa_supplicant manager git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1990 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++ configure.in | 5 ++++ src/Makefile.am | 2 +- src/supplicant-manager/Makefile.am | 16 +++++++++++ .../nm-supplicant-manager.c | 26 ++++++++++++++++++ .../nm-supplicant-manager.h | 27 +++++++++++++++++++ 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/supplicant-manager/Makefile.am create mode 100644 src/supplicant-manager/nm-supplicant-manager.c create mode 100644 src/supplicant-manager/nm-supplicant-manager.h diff --git a/ChangeLog b/ChangeLog index 62156d283e..f0c473ffef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-08-24 Dan Williams + + * configure.in + src/Makefile.am + src/supplicant-manager/Makefile.am + src/supplicant-manager/nm-supplicant-manager.c + src/supplicant-manager/nm-supplicant-manager.h + - Add skeleton bits of the wpa_supplicant manager + 2006-08-24 Dan Williams Patch from Ed Catmur: diff --git a/configure.in b/configure.in index 51c318dc8c..4a9b501b61 100644 --- a/configure.in +++ b/configure.in @@ -153,6 +153,10 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +PKG_CHECK_MODULES(GOBJECT, gobject-2.0) +AC_SUBST(GOBJECT_CFLAGS) +AC_SUBST(GOBJECT_LIBS) + PKG_CHECK_MODULES(HAL, hal >= 0.5.0) AC_SUBST(HAL_CFLAGS) AC_SUBST(HAL_LIBS) @@ -358,6 +362,7 @@ src/Makefile src/named-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile +src/supplicant-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 9a241e419d..1337169fb8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=named-manager vpn-manager dhcp-manager backends +SUBDIRS=named-manager vpn-manager dhcp-manager supplicant-manager backends INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/include \ diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am new file mode 100644 index 0000000000..69d9db87c5 --- /dev/null +++ b/src/supplicant-manager/Makefile.am @@ -0,0 +1,16 @@ +INCLUDES = -I${top_srcdir}/utils -I${top_srcdir}/src -I${top_srcdir}/include + +noinst_LTLIBRARIES = libsupplicant-manager.la + +libsupplicant_manager_la_SOURCES = nm-supplicant-manager.h nm-supplicant-manager.c + +libsupplicant_manager_la_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GTHREAD_CFLAGS) \ + -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ + -DNM_LOCALSTATEDIR=\"$(localstatedir)\" \ + -DDBUS_API_SUBJECT_TO_CHANGE + +libsupplicant_manager_la_LIBADD = \ + $(DBUS_LIBS) \ + $(GTHREAD_LIBS) diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c new file mode 100644 index 0000000000..4d1aff0835 --- /dev/null +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2006 Red Hat, Inc. + * + * Written 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include +#include "nm-supplicant-manager.h" +#include "nm-device.h" + + diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h new file mode 100644 index 0000000000..be64d46703 --- /dev/null +++ b/src/supplicant-manager/nm-supplicant-manager.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2006 Red Hat, Inc. + * + * Written 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef NM_SUPPLICANT_MANAGER_H +#define NM_SUPPLICANT_MANAGER_H + + + +#endif /* NM_SUPPLICANT_MANAGER_H */