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

* configure.in: Strip out TARGET_DISTRO and
	SYSTEM_BACKEND_FILE variables.  Switch to Automake
	conditionals.

	* src/Makefile.am (noinst_LTLIBRARIES): Add libnmbackend.la.
	(libnmbackend_la_SOURCES): Use Automake conditionals
	to add distro-specific files.

	* initscript/Makefile.am (SUBDIRS): Update to
	use conditionals.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@309 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

@@ -1,3 +1,16 @@
+2004-11-12  Colin Walters  <walters@redhat.com>
+
+	* configure.in: Strip out TARGET_DISTRO and
+	SYSTEM_BACKEND_FILE variables.  Switch to Automake
+	conditionals.
+
+	* src/Makefile.am (noinst_LTLIBRARIES): Add libnmbackend.la.
+	(libnmbackend_la_SOURCES): Use Automake conditionals
+	to add distro-specific files.
+
+	* initscript/Makefile.am (SUBDIRS): Update to
+	use conditionals.
+
 2004-11-12  Colin Walters  <walters@redhat.com>
 
 	Patches from j bootlab org

configure.in

@@ -27,8 +27,6 @@ AC_ARG_WITH(distro,
                           --with-distro=slackware
 ],,)
 
-TARGET_DISTRO=
-SYSTEM_BACKEND_FILE=
 if test "z$with_distro" = "z"; then
 	AC_CHECK_FILE(/etc/mandrake-release,with_distro="mandrake")
 	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
@@ -37,37 +35,25 @@ if test "z$with_distro" = "z"; then
 	AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
 	AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
 fi
+with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
 if test "z$with_distro" = "z"; then
 	echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=<distro>"
 	exit 1
 else
-	with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 	case $with_distro in
-		redhat)
-			TARGET_DISTRO=RedHat
-			SYSTEM_BACKEND_FILE=NetworkManagerRedHat.o
-			;;
-		gentoo)
-			TARGET_DISTRO=Gentoo
-			SYSTEM_BACKEND_FILE=NetworkManagerGentoo.o
-			;;
-		debian)
-			TARGET_DISTRO=Debian
-			SYSTEM_BACKEND_FILE=NetworkManagerDebian.o
-			;;
-		slackware)
-			TARGET_DISTRO=Slackware
-			SYSTEM_BACKEND_FILE=NetworkManagerSlackware.o
-			;;
+		redhat|gentoo|debian|slackware) ;;
 		*)
 			echo "Your distribution(${with_distro}) is not yet supported!  (patches welcome)"
 			exit 1
 			;;
 	esac
 fi
-AC_SUBST(TARGET_DISTRO)
-AC_SUBST(SYSTEM_BACKEND_FILE)
+AM_CONDITIONAL(TARGET_REDHAT, test x"$with_distro" = xredhat)
+AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
+AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
+AM_CONDITIONAL(TARGET_MANDRAKE, test x"$with_distro" = xmandrake)
+AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 
 AC_CHECK_HEADER(iwlib.h, [],
 			[AC_MSG_ERROR(iwlib.h not found. Install wireless-tools.)], [])
@@ -195,5 +181,5 @@ NetworkManager.pc
 ])
 
 echo
-echo Distribution targeting: ${TARGET_DISTRO}
+echo Distribution targeting: ${with_distro}
 echo 'if this is not correct, please specifiy your distro with --with-distro=<distro>'

initscript/Makefile.am

@@ -1,5 +1,16 @@
-SUBDIRS = $(TARGET_DISTRO)
-DIST_SUBDIRS=RedHat Gentoo Debian Slackware
+SUBDIRS = 
+if TARGET_REDHAT
+SUBDIRS += RedHat
+endif
+if TARGET_GENTOO
+SUBDIRS += Gentoo
+endif
+if TARGET_DEBIAN
+SUBDIRS += Debian
+endif
+if TARGET_SLACKWARE
+SUBDIRS += Slackware
+endif
 
 INCLUDES = 						\
 	$(NM_CFLAGS) 			   		\

src/Makefile.am

@@ -3,7 +3,7 @@ INCLUDES = -I${top_srcdir}
 
 CPPFLAGS = 						\
 	$(NM_CFLAGS) 			   		\
-	$(OPENSSL_CFLAGS)				\	
+	$(OPENSSL_CFLAGS)				\
 	-Wall						\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
 	-DG_DISABLE_DEPRECATED			\
@@ -12,6 +12,8 @@ CPPFLAGS = 						\
 
 bin_PROGRAMS = NetworkManager
 
+noinst_LTLIBRARIES = libnmbackend.la
+
 NetworkManager_SOURCES =					\
 		NetworkManagerAP.c				\
 		NetworkManagerAP.h				\
@@ -35,20 +37,31 @@ if !WITH_GCRYPT
 NetworkManager_SOURCES += gnome-keyring-md5.c gnome-keyring-md5.h
 endif
 
-EXTRA_NetworkManager_SOURCES =			\
-		backends/NetworkManagerDebian.c	\
-		backends/NetworkManagerGentoo.c	\
-		backends/NetworkManagerRedHat.c	\
-		backends/NetworkManagerSlackware.c	\
-		backends/shvar.c				\
+NetworkManager_LDADD = $(NM_LIBS) $(IWLIB) libnmbackend.la
+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	
 
-NetworkManager_LDADD = $(NM_LIBS) $(IWLIB) backends/$(SYSTEM_BACKEND_FILE)
-if WITH_GCRYPT
-NetworkManager_LDADD += $(LIBGCRYPT_LIBS)
+if TARGET_REDHAT
+libnmbackend_la_SOURCES += backends/NetworkManagerRedHat.c
 endif
+if TARGET_GENTOO
+libnmbackend_la_SOURCES += backends/NetworkManagerGentoo.c
+endif
+if TARGET_DEBIAN
+libnmbackend_la_SOURCES += backends/NetworkManagerDebian.c
+endif
+if TARGET_SLACKWARE
+libnmbackend_la_SOURCES += backends/NetworkManagerSlackware.c
+endif
+
+libnmbackend_la_LIBADD = $(NM_LIBS)
+libnmbackend_la_CPPFLAGS = $(NM_CFLAGS)
 
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = NetworkManager.conf