From c131ea55120adc0efe6d3b8f84f142a9e4cabf67 Mon Sep 17 00:00:00 2001
From: Niklas
Date: Mon, 10 Oct 2011 17:26:17 +0200
Subject: added new files

---
 README | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'README')

diff --git a/README b/README
index 8c226d1..9cf6ab1 100644
--- a/README
+++ b/README
@@ -17,7 +17,13 @@ What does this do excatly?
  (Note: The website content is crucial to the successfull execution of this program!)
 
 How to build/use it?
-  Simply run ./build.sh to create a package of fbgui (including all the required libs).
+
+  First compile the source code using:
+	./build.sh
+
+  To build the package first compile then use:
+	./build.pkg.sh
+  
   To integrate into a Preboot-Media, follow instructions on the wiki.
 
 Dependancies:
-- 
cgit v1.2.3-55-g7522


From 85bf21b866d540e5d61b515493d83829fe159ca2 Mon Sep 17 00:00:00 2001
From: Niklas Goby
Date: Wed, 23 Nov 2011 12:40:03 +0100
Subject: modified cmakelists, changed include paths

---
 AUTHORS                      |  3 ++-
 CMakeLists.txt               | 12 ++++++------
 README                       |  1 +
 src/customdhcpcd/logwriter.c |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'README')

diff --git a/AUTHORS b/AUTHORS
index ca9c318..8f197a0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,9 @@
 Master-Teamproject at Lehrstuhl fuer Kommunikationssysteme for Uni Freiburg, 2010-2011.
 Sub-Project: Framebuffer-GUI "fbgui"
+Sub-Project: NetworkDiscovery "ndgui"
 
 Authors:
 
 Jonathan Bauer <bauer at informatik.uni-freiburg.de>
-Niklas Goby <...>
+Niklas Goby <goby at informatik.uni-freiburg.de>
 Sebastian Wagner <sebastian.wagner at mars.uni-freiburg.de>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6383b26..bb53f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,17 +15,17 @@ endif(QT4_FOUND)
 set(QT_USE_QTNETWORK TRUE)
 set(QT_USE_QTWEBKIT TRUE)
 
-file(GLOB FBGUI_SOURCES src/*.cpp)
-file(GLOB FBGUI_MOC_HEADERS src/*.h common/*.h)
-file(GLOB FBGUI_UIS src/*.ui)
-file(GLOB FBGUI_RCS src/*.qrc)
+file(GLOB FBGUI_SOURCES src/fbgui/*.cpp)
+file(GLOB FBGUI_MOC_HEADERS src/fbgui/*.h src/common/*.h)
+file(GLOB FBGUI_UIS src/fbgui/*.ui)
+file(GLOB FBGUI_RCS src/fbgui/*.qrc)
  
 include_directories(${CMAKE_CURRENT_BINARY_DIR} 
   /usr/include/
   /usr/include/netlink/
   /usr/include/netlink/route/
-  ./customdhcpcd/src/
-  ./common
+  ./src/customdhcpcd/
+  ./src/common
   ./build
   ${QT_INCLUDES}
   /usr/local/Qxt/include/QxtCore
diff --git a/README b/README
index 9cf6ab1..18b9516 100644
--- a/README
+++ b/README
@@ -31,3 +31,4 @@ Dependancies:
  QXT-Framework (QT extension)
  sysfsutils
  (QJSon)
+ libnl
diff --git a/src/customdhcpcd/logwriter.c b/src/customdhcpcd/logwriter.c
index 6230d4c..ee8bb1d 100644
--- a/src/customdhcpcd/logwriter.c
+++ b/src/customdhcpcd/logwriter.c
@@ -18,7 +18,7 @@
 #include "logger.h"
 #include "logwriter.h"
 
-#include "../../common/fbgui.h" // for constants
+#include "../common/fbgui.h" // for constants
 /*sockets for the logger and the qt-reader */
 int sockfd, ns;
 int retval = -1;
-- 
cgit v1.2.3-55-g7522