# HG changeset patch
# User Markus Bröker <mbroeker@largo.dyndns.tv>
# Date 1268069404 -3600
# Node ID fef2ccfa7b1276d1edc631ed7898be01f8b98fc8
# Parent  430dbec0c2281d093d7e12ec292753c48c060ba3
step 2) Header seperation

cpuid, bits, list and maybe lsf are too common names
and have to reside in a seperate folder to avoid clashes

committer: Markus Bröker <mbroeker@largo.homelinux.org>

diff --git a/lsflib/Makefile.am b/lsflib/Makefile.am
--- a/lsflib/Makefile.am
+++ b/lsflib/Makefile.am
@@ -14,11 +14,11 @@
 liblsf_la_SOURCES += src/tokenizer.c
 liblsf_la_SOURCES += src/xor.c
 
-      liblsf_ladir = $(prefix)/include
+      liblsf_ladir = $(prefix)/include/lsf
 
-liblsf_la_HEADERS  = include/bits.h
-liblsf_la_HEADERS += include/cpuid.h
-liblsf_la_HEADERS += include/list.h
-liblsf_la_HEADERS += include/lsf.h
+liblsf_la_HEADERS  = include/lsf/bits.h
+liblsf_la_HEADERS += include/lsf/cpuid.h
+liblsf_la_HEADERS += include/lsf/list.h
+liblsf_la_HEADERS += include/lsf/lsf.h
 
  liblsf_la_LDFLAGS = -version-info 0:58:0
diff --git a/lsflib/include/lsf/lsf.h b/lsflib/include/lsf/lsf.h
--- a/lsflib/include/lsf/lsf.h
+++ b/lsflib/include/lsf/lsf.h
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 #ifndef __LIST__H
-#include <list.h>
+#include <lsf/list.h>
 #endif
 
 /* tokenizer splits a file into tokens */
diff --git a/lsflib/src/get_line.c b/lsflib/src/get_line.c
--- a/lsflib/src/get_line.c
+++ b/lsflib/src/get_line.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 #ifndef LINE_LENGTH
 #define LINE_LENGTH 100
diff --git a/lsflib/src/getdir.c b/lsflib/src/getdir.c
--- a/lsflib/src/getdir.c
+++ b/lsflib/src/getdir.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 int isDir (char *filename)
 {
diff --git a/lsflib/src/list.c b/lsflib/src/list.c
--- a/lsflib/src/list.c
+++ b/lsflib/src/list.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <list.h>
+#include <lsf/list.h>
 
 Node *addnode (Node * node, char *data)
 {
diff --git a/lsflib/src/md5recursive.c b/lsflib/src/md5recursive.c
--- a/lsflib/src/md5recursive.c
+++ b/lsflib/src/md5recursive.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 void md5recursive (char *root, int recursive)
 {
diff --git a/lsflib/src/md5sum.c b/lsflib/src/md5sum.c
--- a/lsflib/src/md5sum.c
+++ b/lsflib/src/md5sum.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 unsigned char *md5sum (char *fname)
 {
diff --git a/lsflib/src/tokenizer.c b/lsflib/src/tokenizer.c
--- a/lsflib/src/tokenizer.c
+++ b/lsflib/src/tokenizer.c
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 Node *tokenizer (FILE * f, const char *delim)
 {
diff --git a/lsflib/tools/cpuid.c b/lsflib/tools/cpuid.c
--- a/lsflib/tools/cpuid.c
+++ b/lsflib/tools/cpuid.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 Markus Broeker
  */
 
-#include <cpuid.h>
+#include <lsf/cpuid.h>
 
 char *get_cpu_brand (int function)
 {
diff --git a/lsflib/tools/digest.c b/lsflib/tools/digest.c
--- a/lsflib/tools/digest.c
+++ b/lsflib/tools/digest.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <lsf.h>
+#include <lsf/lsf.h>
 
 int main (int argc, char **argv)
 {
diff --git a/lsflib/tools/dump.c b/lsflib/tools/dump.c
--- a/lsflib/tools/dump.c
+++ b/lsflib/tools/dump.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <bits.h>
+#include <lsf/bits.h>
 
 int main (int argc, char **argv)
 {
diff --git a/lsflib/tools/list.c b/lsflib/tools/list.c
--- a/lsflib/tools/list.c
+++ b/lsflib/tools/list.c
@@ -5,7 +5,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <list.h>
+
+#include <lsf/list.h>
 
 int main (int argc, char **argv)
 {
diff --git a/lsflib/tools/main.c b/lsflib/tools/main.c
--- a/lsflib/tools/main.c
+++ b/lsflib/tools/main.c
@@ -5,7 +5,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <cpuid.h>
+
+#include <lsf/cpuid.h>
 
 int main (int argc, char **argv)
 {