Re: Multiple backend files patch

[Tom Parker <palfrey tevp net>]

Colin Walters wrote:
> Erg, this entire setup is Evil and Wrong :)  The right way is to make
> the backend into a noinst libtool library, use Automake conditionals.  I
> just rewrote the code to do that.

Gnome anon CVS servers have got the latest changes, so now able to test 
all of this! Couple of minor things:
1) NetworkManager{Debian,Redhat} still #include the .c backend files
2) All backends are built with the complete set of support files, as 
opposed to the ones they actually need.

Patch to fix these things (plus the "CPPFLAGS should be AM_CPPFLAGS" 
warning that's been bugging me for a while) attached.

Tom

Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- src/Makefile.am	12 Nov 2004 18:49:32 -0000	1.16
+++ src/Makefile.am	13 Nov 2004 13:38:45 -0000
@@ -1,7 +1,7 @@
 
 INCLUDES = -I${top_srcdir}
 
-CPPFLAGS = 						\
+AM_CPPFLAGS = 						\
 	$(NM_CFLAGS) 			   		\
 	$(OPENSSL_CFLAGS)				\
 	-Wall						\
@@ -42,19 +42,20 @@
 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
Index: src/backends/NetworkManagerDebian.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerDebian.c,v
retrieving revision 1.11
diff -u -r1.11 NetworkManagerDebian.c
--- src/backends/NetworkManagerDebian.c	12 Nov 2004 18:21:17 -0000	1.11
+++ src/backends/NetworkManagerDebian.c	13 Nov 2004 13:38:45 -0000
@@ -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
  *
Index: src/backends/NetworkManagerRedHat.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/backends/NetworkManagerRedHat.c,v
retrieving revision 1.12
diff -u -r1.12 NetworkManagerRedHat.c
--- src/backends/NetworkManagerRedHat.c	21 Oct 2004 17:42:14 -0000	1.12
+++ src/backends/NetworkManagerRedHat.c	13 Nov 2004 13:38:45 -0000
@@ -27,14 +27,6 @@
 #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"
-
-
 /*
  * nm_system_init
  *