More sysfsutils stuff but the linker is not working just yet

29 files changed, 11 insertions, 72 deletions

diff --git a/config.h.in b/config.h.in
index 4499598..4e81596 100644
--- a/config.h.in
+++ b/config.h.in
@@ -52,6 +52,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Name of package */
+#undef PACKAGE
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -73,6 +76,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Version number of package */
+#undef VERSION
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
diff --git a/configure b/configure
index f03a566..08acafb 100755
--- a/configure
+++ b/configure
@@ -2633,9 +2633,6 @@ ac_config_headers="$ac_config_headers config.h"
 subdirs="$subdirs sysfsutils"
 
 
-CFLAGS="-Wall -O2 -I../include -static"
-LDFLAGS="-lpthread -lrt"
-
 # Checks for programs.
 DEPDIR="${am__leading_dot}deps"
 
diff --git a/configure.ac b/configure.ac
index f563e42..b21fe1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,6 @@ AC_CONFIG_SRCDIR([src/netnuke.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SUBDIRS([sysfsutils])
 
-CFLAGS="-Wall -O2 -I../include -static"
-LDFLAGS="-lpthread -lrt"
-
 # Checks for programs.
 AC_PROG_CC_C99
 AS_IF([test "$ac_cv_prog_cc_c99" = "no"],
diff --git a/src/Makefile.am b/src/Makefile.am
index 47767f5..20ebdd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
+AM_CFLAGS=-Wall -O2 -I../include -I../sysfsutils/include -static
+AM_LDFLAGS=-lpthread -lrt
+
 sbin_PROGRAMS= netnuke
 
 netnuke_SOURCES=	bus.c		\
diff --git a/src/Makefile.in b/src/Makefile.in
index 48d737a..bcacb4c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -150,6 +150,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
+AM_CFLAGS = -Wall -O2 -I../include -I../sysfsutils/include -static
+AM_LDFLAGS = -lpthread -lrt
 netnuke_SOURCES = bus.c		\
 			misc.c		\
 			netnuke.c	\
diff --git a/sysfsutils/cmd/CVS/Entries b/sysfsutils/cmd/CVS/Entries
deleted file mode 100644
index 3fb93fa..0000000
--- a/sysfsutils/cmd/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/GPL/1.1.1.1/Mon Aug 25 08:12:28 2003//Tsysfsutils-2_1_0
-/Makefile.am/1.2.2.2/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-/Makefile.in/1.2.2.3/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-/names.c/1.2.2.1/Wed Apr  6 23:18:11 2005//Tsysfsutils-2_1_0
-/names.h/1.2.2.1/Wed Apr  6 23:18:11 2005//Tsysfsutils-2_1_0
-/systool.c/1.2.2.3/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/cmd/CVS/Repository b/sysfsutils/cmd/CVS/Repository
deleted file mode 100644
index 3b939c7..0000000
--- a/sysfsutils/cmd/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/cmd
diff --git a/sysfsutils/cmd/CVS/Root b/sysfsutils/cmd/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/cmd/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/cmd/CVS/Tag b/sysfsutils/cmd/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/cmd/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0
diff --git a/sysfsutils/docs/CVS/Entries b/sysfsutils/docs/CVS/Entries
deleted file mode 100644
index 8293903..0000000
--- a/sysfsutils/docs/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-/libsysfs.txt/1.2.2.4.4.1/Wed Aug 23 07:37:02 2006//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/docs/CVS/Repository b/sysfsutils/docs/CVS/Repository
deleted file mode 100644
index 4e73e28..0000000
--- a/sysfsutils/docs/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/docs
diff --git a/sysfsutils/docs/CVS/Root b/sysfsutils/docs/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/docs/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/docs/CVS/Tag b/sysfsutils/docs/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/docs/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0
diff --git a/sysfsutils/include/CVS/Entries b/sysfsutils/include/CVS/Entries
deleted file mode 100644
index 60ae334..0000000
--- a/sysfsutils/include/CVS/Entries
+++ /dev/null
@@ -1,3 +0,0 @@
-/dlist.h/1.2.2.4/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-/libsysfs.h/1.2.2.9/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/include/CVS/Repository b/sysfsutils/include/CVS/Repository
deleted file mode 100644
index 5b89b28..0000000
--- a/sysfsutils/include/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/include
diff --git a/sysfsutils/include/CVS/Root b/sysfsutils/include/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/include/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/include/CVS/Tag b/sysfsutils/include/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/include/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0
diff --git a/sysfsutils/lib/CVS/Entries b/sysfsutils/lib/CVS/Entries
deleted file mode 100644
index d1b516a..0000000
--- a/sysfsutils/lib/CVS/Entries
+++ /dev/null
@@ -1,14 +0,0 @@
-/LGPL/1.1.1.1/Mon Aug 25 08:12:32 2003//Tsysfsutils-2_1_0
-/Makefile.am/1.2.2.5/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-/Makefile.in/1.2.2.4/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-/dlist.c/1.2.2.4/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-/sysfs.h/1.2.2.3/Tue May  3 22:26:35 2005//Tsysfsutils-2_1_0
-/sysfs_attr.c/1.1.2.3/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-/sysfs_bus.c/1.2.2.2/Fri Nov 25 08:42:43 2005//Tsysfsutils-2_1_0
-/sysfs_class.c/1.2.2.8/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-/sysfs_device.c/1.2.2.6/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-/sysfs_dir.c/1.2/Wed Apr  6 20:57:12 2005//Tsysfsutils-2_1_0
-/sysfs_driver.c/1.2.2.4/Mon Nov 28 06:56:24 2005//Tsysfsutils-2_1_0
-/sysfs_module.c/1.1.2.3/Mon Nov 28 08:47:31 2005//Tsysfsutils-2_1_0
-/sysfs_utils.c/1.2.2.5/Mon Aug  7 05:08:01 2006//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/lib/CVS/Repository b/sysfsutils/lib/CVS/Repository
deleted file mode 100644
index 1bdc7b3..0000000
--- a/sysfsutils/lib/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/lib
diff --git a/sysfsutils/lib/CVS/Root b/sysfsutils/lib/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/lib/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/lib/CVS/Tag b/sysfsutils/lib/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/lib/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0
diff --git a/sysfsutils/m4/CVS/Entries b/sysfsutils/m4/CVS/Entries
deleted file mode 100644
index 359592c..0000000
--- a/sysfsutils/m4/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-/klibc.m4/1.1.2.1/Fri Nov 25 14:57:37 2005//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/m4/CVS/Repository b/sysfsutils/m4/CVS/Repository
deleted file mode 100644
index 46dc622..0000000
--- a/sysfsutils/m4/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/m4
diff --git a/sysfsutils/m4/CVS/Root b/sysfsutils/m4/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/m4/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/m4/CVS/Tag b/sysfsutils/m4/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/m4/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0
diff --git a/sysfsutils/test/CVS/Entries b/sysfsutils/test/CVS/Entries
deleted file mode 100644
index ea94151..0000000
--- a/sysfsutils/test/CVS/Entries
+++ /dev/null
@@ -1,20 +0,0 @@
-/GPL/1.2/Wed Apr  6 20:57:12 2005//Tsysfsutils-2_1_0
-/Makefile.am/1.3.2.4.4.1/Wed Aug 23 07:37:02 2006//Tsysfsutils-2_1_0
-/Makefile.in/1.3.2.4/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/create-test/1.2.2.1/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/dlist_test.c/1.3.2.3/Fri Nov 25 14:06:05 2005//Tsysfsutils-2_1_0
-/get_device.c/1.2.2.3/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/get_driver.c/1.2.2.3/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/get_module.c/1.1.2.1/Tue May  3 22:29:10 2005//Tsysfsutils-2_1_0
-/libsysfs.conf/1.2.2.2/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/test-defs.h/1.2.2.4/Mon Aug  7 05:08:02 2006//Tsysfsutils-2_1_0
-/test.c/1.2.2.4/Mon Aug  7 05:08:02 2006//Tsysfsutils-2_1_0
-/test_attr.c/1.1.2.1/Mon Nov 28 10:25:27 2005//Tsysfsutils-2_1_0
-/test_bus.c/1.2.2.3/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/test_class.c/1.2.2.3/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-/test_device.c/1.1.2.1/Mon Nov 28 10:25:27 2005//Tsysfsutils-2_1_0
-/test_driver.c/1.2.2.4/Mon Dec  5 07:06:03 2005//Tsysfsutils-2_1_0
-/test_module.c/1.1.2.2/Mon Dec  5 07:06:03 2005//Tsysfsutils-2_1_0
-/test_utils.c/1.2.2.4/Mon Aug  7 05:08:02 2006//Tsysfsutils-2_1_0
-/testout.c/1.2.2.3/Mon Nov 28 10:22:10 2005//Tsysfsutils-2_1_0
-D
diff --git a/sysfsutils/test/CVS/Repository b/sysfsutils/test/CVS/Repository
deleted file mode 100644
index 3d63d49..0000000
--- a/sysfsutils/test/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-sysfsutils/test
diff --git a/sysfsutils/test/CVS/Root b/sysfsutils/test/CVS/Root
deleted file mode 100644
index d5dff2a..0000000
--- a/sysfsutils/test/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:mohanltc@linux-diag.cvs.sourceforge.net:/cvsroot/linux-diag
diff --git a/sysfsutils/test/CVS/Tag b/sysfsutils/test/CVS/Tag
deleted file mode 100644
index 450247d..0000000
--- a/sysfsutils/test/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tsysfsutils-2_1_0