--- Makefile.am	2006-06-06 15:38:35.000000000 +0200
+++ Makefile.am.oden	2006-06-15 17:51:04.000000000 +0200
@@ -1,20 +1,9 @@
-noinst_DATA =					\
-	include/list.h
-
 EXTRA_DIST =					\
-	$(sysconf_DATA)				\
-	$(astconf_DATA)				\
-	$(noinst_DATA)				\
-	visdn.spec				\
-	visdn-init				\
-	visdn-sleep.diff			\
-	visdn-sysconfig				\
 	modules/linux_compat/linux/kfifo.h	\
 	modules/include/kernel_config.h.in	\
 	modules/include/linux/lapd.h		\
 	modules/include/linux/vgsm.h		\
-	modules/include/linux/visdn/*.h		\
-	docs/*
+	modules/include/linux/visdn/*.h
 
 SUBDIRS =
 
@@ -22,23 +11,6 @@
 SUBDIRS += modules
 endif
 
-SUBDIRS += libq931
-SUBDIRS += scripts samples visdnctl vgsmctl
-
-if asterisk_modules
-SUBDIRS += chan_visdn
-SUBDIRS += chan_vgsm
-SUBDIRS += app_visdn_ppp
-endif
-
-if pppd_plugin
-SUBDIRS += pppd_plugin
-endif
-
-if tests
-SUBDIRS += tests
-endif
-
 dist-rpm: dist-bzip2
 	rpmbuild -ta @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
 
--- configure.ac	2006-06-06 15:20:59.000000000 +0200
+++ configure.ac.oden	2006-06-15 17:50:21.000000000 +0200
@@ -3,7 +3,6 @@
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_SRCDIR([chan_visdn/chan_visdn.c])
 AC_CONFIG_HEADER([config.h])
 
 ## Checks for libraries.
@@ -44,8 +43,6 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gettimeofday memset select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr])
 
-visdnhwconfdir="$sysconfdir/visdn"
-AC_SUBST(visdnhwconfdir)
 
 #-----------------------------------------------------------------------------
 
@@ -112,234 +109,6 @@
 
 #-----------------------------------------------------------------------------
 
-AC_ARG_ENABLE(
-	[asterisk-modules],
-	AC_HELP_STRING(
-		[--enable-asterisk-modules],
-		[Enable asterisk modules]),
-	[enable_asterisk_modules="$enableval"],
-	[enable_asterisk_modules="auto"])
-
-if [[ "$enable_asterisk_modules" != "no" ]]; then
-
-AC_MSG_CHECKING([asterisk modules directory])
-
-AC_ARG_WITH(
-	[asterisk-modules],
-	AC_HELP_STRING(
-		[--with-asterisk-modules=DIR],
-		[Specify asterisk modules directory]),
-	[astmoddir=$withval],
-	[
-		if [[ -d "/usr/lib/asterisk/modules" ]]; then
-			astmoddir="/usr/lib/asterisk/modules"
-		else
-			enable_asterisk_modules="no"
-		fi
-	])
-
-if [[ "$enable_asterisk_modules" = "yes" ]]; then
-	if [[ ! -d "$astmoddir" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate asterisk modules directory])
-	fi
-fi
-
-AC_SUBST(astmoddir)
-AC_MSG_RESULT([$astmoddir])
-
-#----------------
-
-AC_MSG_CHECKING([asterisk includes])
-
-AC_ARG_WITH(
-	[asterisk-includes],
-	AC_HELP_STRING(
-		[--with-asterisk-includes=DIR],
-		[Specify asterisk includes directory (the prefix before \
-		asterisk/)]),
-	[astincdir=$withval],
-	[
-		if [[ -d "/usr/include/asterisk" ]]; then
-			astincdir="/usr/include/"
-		else
-			enable_asterisk_modules="no"
-		fi
-	])
-
-if [[ "$enable_asterisk_modules" = "yes" ]]; then
-	if [[ ! -d "$astincdir/asterisk" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate asterisk includes directory])
-	fi
-fi
-
-CPPFLAGS="$CPPFLAGS -I$astincdir"
-
-AC_SUBST(astincdir)
-AC_MSG_RESULT([$astincdir])
-
-AC_CHECK_HEADERS(asterisk/version.h)
-
-#---------------
-
-AC_MSG_CHECKING([asterisk configuration directory])
-
-AC_ARG_WITH(
-	[asterisk-config],
-	AC_HELP_STRING(
-		[--with-asterisk-config=DIR],
-		[Specify asterisk configuration directory]),
-	[astconfdir=$withval],
-	[
-		if [[ -d "/etc/asterisk" ]]; then
-			astconfdir="/etc/asterisk"
-		else
-			enable_asterisk_modules="no"
-		fi
-	])
-
-if [[ "$enable_asterisk_modules" = "yes" ]]; then
-	if [[ ! -d "$astconfdir" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate asterisk config directory])
-	fi
-fi
-
-AC_MSG_RESULT([$astconfdir])
-AC_SUBST(astconfdir)
-
-fi
-
-AM_CONDITIONAL(asterisk_modules, test "$enable_asterisk_modules" != "no")
-
-#-----------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-	[pppd-plugin],
-	AC_HELP_STRING(
-		[--enable-pppd-plugin],
-		[Enable pppd plugin]),
-	[enable_pppd="$enableval"],
-	[enable_pppd="auto"])
-
-if [[ "$enable_pppd" != "no" ]]; then
-
-AC_MSG_CHECKING([pppd plugins directory])
-
-AC_ARG_WITH(
-	[pppd-plugins],
-	AC_HELP_STRING(
-		[--with-pppd-plugins=DIR],
-		[Specify PPPD plugins directory]),
-	[pppdpluginsdir="$withval"],
-	[
-		if [[ -d "/usr/lib/pppd/" -a \
-		      -d "/usr/lib/pppd/`/bin/ls -Ar1 /usr/lib/pppd/ \
-						| head -n 1`" ]]; then
-			pppdpluginsdir="/usr/lib/pppd/`/bin/ls -Ar1 \
-						/usr/lib/pppd/ | head -n 1`"
-		else
-			enable_pppd="no"
-		fi
-	])
-
-if [[ "$enable_pppd" = "yes" ]]; then
-	if [[ ! -d "$pppdpluginsdir" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate pppd plugins directory])
-	fi
-fi
-
-AC_SUBST(pppdpluginsdir)
-AC_MSG_RESULT([$pppdpluginsdir])
-
-#----------
-
-AC_MSG_CHECKING([pppd includes directory])
-
-AC_ARG_WITH(
-	[pppd-includes],
-	AC_HELP_STRING(
-		[--with-pppd-includes],
-		[Specify pppd includes directory]),
-	[pppdincdir=$withval],
-	[
-		if [[ -d "/usr/include/pppd/" ]]; then
-			pppdincdir="/usr/include/pppd/"
-
-			if [[ ! -f "$pppdincdir/pppd.h" -o \
-			      ! -f "$pppdincdir/fsm.h" -o \
-			      ! -f "$pppdincdir/lcp.h" ]]; then
-				enable_pppd="no"
-			fi
-		else
-			enable_pppd="no"
-		fi
-	])
-
-if [[ "$enable_pppd" = "yes" ]]; then
-	if [[ ! -d "$pppdincdir" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate pppd includes directory])
-	fi
-
-	if [[ ! -f "$pppdincdir/pppd.h" -o \
-	      ! -f "$pppdincdir/fsm.h" -o \
-	      ! -f "$pppdincdir/lcp.h" ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Missing pppd headers])
-	fi
-fi
-
-AC_MSG_RESULT([$pppdincdir])
-AC_SUBST(pppdincdir)
-
-#------------
-
-AC_MSG_CHECKING([pppd config directory])
-
-AC_ARG_WITH(
-	[pppd-config],
-	AC_HELP_STRING(
-		[--with-pppd-config],
-		[Specify pppd configuration directory]),
-	[pppdconfdir=$withval],
-	[
-		if [[ -d "/etc/ppp/" ]]; then
-			pppdconfdir="/etc/ppp/"
-		else
-			enable_pppd="no"
-		fi
-	]
-	)
-
-if [[ "$enable_pppd" = "yes" ]]; then
-	if [[ ! -d $pppdconfdir ]]; then
-		AC_MSG_RESULT([failed!])
-		AC_MSG_ERROR([Cannot locate pppd configuration directory])
-	fi
-fi
-
-AC_SUBST(pppdconfdir)
-AC_MSG_RESULT([$pppdconfdir])
-
-fi
-
-AM_CONDITIONAL(pppd_plugin, test "$enable_pppd" = "yes")
-
-#-----------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-	[tests],
-	AC_HELP_STRING(
-		[--enable-tests],
-		[Enable testing tools]))
-
-AM_CONDITIONAL(tests, test "$enable_tests" = yes)
-
-#-----------------------------------------------------------------------------
-
 enable_debug_code="yes"
 
 AC_ARG_ENABLE(
@@ -390,17 +159,6 @@
 	test -n "`echo $drivers | grep vgsm`" || test "$drivers" = "all")
 
 AC_CONFIG_FILES([Makefile
-		scripts/Makefile
-		scripts/visdn_configurator
-		samples/Makefile
-		libq931/Makefile
-		chan_visdn/Makefile
-		chan_vgsm/Makefile
-		app_visdn_ppp/Makefile
-		visdnctl/Makefile
-		vgsmctl/Makefile
-		pppd_plugin/Makefile
-		tests/Makefile
 		modules/include/kernel_config.h
 		modules/Makefile
 		modules/hfc-4s/Makefile
@@ -416,10 +174,6 @@
 		modules/timer-system/Makefile
 		modules/netdev/Makefile
 		modules/ppp/Makefile
-		modules/ec/Makefile
-		doxygen.conf
-		visdn.spec])
-
-#		modules/hfc-e1/Makefile
+		modules/ec/Makefile])
 
 AC_OUTPUT