colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-11-13 Colin Walters <walters@redhat.com>

Browse Source 
Patch from Tom Parker <palfrey@tevp.net>:

	* src/Makefile.am (CPPFLAGS): Switch to AM_CPPFLAGS.

	* src/backends/NetworkManagerRedHat.c: Switch to
	including shvar.h instead of shvar.c.

	* src/backends/NetworkManagerDebian.c: Don't include
	interface_parser.c in source file.

	(libnmbackend_la_SOURCES): Don't include shvar.[ch]
	and interface_parser.[ch].
	* src/Makefile.am (libnmbackend_la_SOURCES) <TARGET_REDHAT>:
	Include shvar.c and shvar.h here.
	(libnmbackend_la_SOURCES) <TARGET_DEBIAN>: Include
	interface_parser.c and interface_parser.h here.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@310 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Colin Walters
2004-11-13 18:34:02 +00:00
committed by Colin Walters
parent e889e9d3f5
commit 616961f45c
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@@ -1,3 +1,22 @@
2004-11-13 Colin Walters <walters@redhat.com>
Patch from Tom Parker <palfrey@tevp.net>:
* src/Makefile.am (CPPFLAGS): Switch to AM_CPPFLAGS.
* src/backends/NetworkManagerRedHat.c: Switch to
including shvar.h instead of shvar.c.
* src/backends/NetworkManagerDebian.c: Don't include
interface_parser.c in source file.
(libnmbackend_la_SOURCES): Don't include shvar.[ch]
and interface_parser.[ch].
* src/Makefile.am (libnmbackend_la_SOURCES) <TARGET_REDHAT>:
Include shvar.c and shvar.h here.
(libnmbackend_la_SOURCES) <TARGET_DEBIAN>: Include
interface_parser.c and interface_parser.h here.
2004-11-12 Colin Walters <walters@redhat.com>
* configure.in: Strip out TARGET_DISTRO and

15
src/Makefile.am
View File

@@ -1,7 +1,7 @@
INCLUDES = -I${top_srcdir}
CPPFLAGS = \
AM_CPPFLAGS = \
$(NM_CFLAGS) \
$(OPENSSL_CFLAGS) \
-Wall \
@@ -42,19 +42,20 @@ if WITH_GCRYPT
NetworkManager_LDADD += $(LIBGCRYPT_LIBS)
endif
libnmbackend_la_SOURCES = backends/shvar.c \
backends/shvar.h \
backends/interface_parser.c \
backends/interface_parser.h
libnmbackend_la_SOURCES =
if TARGET_REDHAT
libnmbackend_la_SOURCES += backends/NetworkManagerRedHat.c
libnmbackend_la_SOURCES += backends/NetworkManagerRedHat.c \
backends/shvar.c \
backends/shvar.h
endif
if TARGET_GENTOO
libnmbackend_la_SOURCES += backends/NetworkManagerGentoo.c
endif
if TARGET_DEBIAN
libnmbackend_la_SOURCES += backends/NetworkManagerDebian.c
libnmbackend_la_SOURCES += backends/NetworkManagerDebian.c \
backends/interface_parser.c \
backends/interface_parser.h
endif
if TARGET_SLACKWARE
libnmbackend_la_SOURCES += backends/NetworkManagerSlackware.c

3
src/backends/NetworkManagerDebian.c
View File

@@ -34,9 +34,6 @@
#define ARPING "/usr/sbin/arping"
/* hacky, but the redhat one does this as well... */
#include "interface_parser.c"
/*
* nm_system_init
*

9
src/backends/NetworkManagerRedHat.c
View File

@@ -26,14 +26,7 @@
#include "NetworkManagerSystem.h"
#include "NetworkManagerUtils.h"
#include "NetworkManagerDevice.h"
/* Hmm, not good form, but we don't have support
* for multiple files for each system-specific
* backend yet...
*/
#include "shvar.c"
#include "shvar.h"
/*
* nm_system_init