From d38bc8e585ff8312f71398f4306b2251ca558781 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 28 Mar 2011 00:02:42 +0000
Subject: [PATCH] Fixed build

---
 include/System/appclient.h | 2 +-
 include/System/appserver.h | 2 +-
 src/Makefile               | 2 +-
 src/appclient.c            | 3 ++-
 src/appinterface.c         | 3 ++-
 src/appserver.c            | 3 ++-
 src/project.conf           | 2 +-
 tools/Makefile             | 2 +-
 tools/appbroker.c          | 1 +
 tools/appclient.c          | 1 +
 tools/project.conf         | 2 +-
 11 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/include/System/appclient.h b/include/System/appclient.h
index 508113a..f9fb5cd 100644
--- a/include/System/appclient.h
+++ b/include/System/appclient.h
@@ -19,7 +19,7 @@
 # define LIBAPP_APPCLIENT_H
 
 # include <stdint.h>
-# include "event.h"
+# include <System/event.h>
 
 
 /* AppClient */
diff --git a/include/System/appserver.h b/include/System/appserver.h
index cdb0910..af79259 100644
--- a/include/System/appserver.h
+++ b/include/System/appserver.h
@@ -18,7 +18,7 @@
 #ifndef LIBAPP_APPSERVER_H
 # define LIBAPP_APPSERVER_H
 
-# include "event.h"
+# include <System/event.h>
 
 
 /* AppServer */
diff --git a/src/Makefile b/src/Makefile
index b0bddc3..21e41d4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ all: $(TARGETS)
 
 libApp_OBJS = appclient.o appinterface.o appserver.o
 libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lssl
+libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem` -lssl
 
 libApp.a: $(libApp_OBJS)
 	$(AR) libApp.a $(libApp_OBJS)
diff --git a/src/appclient.c b/src/appclient.c
index 7369220..8f51f15 100644
--- a/src/appclient.c
+++ b/src/appclient.c
@@ -31,7 +31,8 @@
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 #endif
-#include "System.h"
+#include <System.h>
+#include "System/App.h"
 #include "appinterface.h"
 
 
diff --git a/src/appinterface.c b/src/appinterface.c
index 99c449c..0d6c694 100644
--- a/src/appinterface.c
+++ b/src/appinterface.c
@@ -28,7 +28,8 @@
 # include <openssl/ssl.h>
 #endif
 #include <errno.h>
-#include "System.h"
+#include <System.h>
+#include "System/App.h"
 #include "appinterface.h"
 #include "../config.h"
 
diff --git a/src/appserver.c b/src/appserver.c
index 32caedb..d4d71a7 100644
--- a/src/appserver.c
+++ b/src/appserver.c
@@ -31,7 +31,8 @@
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 #endif
-#include "System.h"
+#include <System.h>
+#include "System/App.h"
 #include "appinterface.h"
 #include "../config.h"
 
diff --git a/src/project.conf b/src/project.conf
index 340ba85..a3d4489 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -8,5 +8,5 @@ dist=Makefile,appinterface.h
 [libApp]
 type=library
 sources=appclient.c,appinterface.c,appserver.c
-ldflags=-lssl
+ldflags=`pkg-config --libs libSystem` -lssl
 install=$(LIBDIR)
diff --git a/tools/Makefile b/tools/Makefile
index 50f2eaf..0980698 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,7 @@ CPPFLAGSF= -I ../include
 CPPFLAGS=
 CFLAGSF	= -W
 CFLAGS	= -Wall -g -O2 -pedantic
-LDFLAGSF= -lSystem -L../src
+LDFLAGSF= -lApp -L../src
 LDFLAGS	= -L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
 RM	= rm -f
 LN	= ln -f
diff --git a/tools/appbroker.c b/tools/appbroker.c
index 28e8f2e..f87913d 100644
--- a/tools/appbroker.c
+++ b/tools/appbroker.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
+#include "System/App.h"
 
 #define APPBROKER_PROGNAME "AppBroker"
 
diff --git a/tools/appclient.c b/tools/appclient.c
index 473d8b1..dfbaf1b 100644
--- a/tools/appclient.c
+++ b/tools/appclient.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <errno.h>
 #include <System.h>
+#include "System/App.h"
 
 #define APPCLIENT_PROGNAME "AppClient"
 
diff --git a/tools/project.conf b/tools/project.conf
index 72bd7ac..0b23b43 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -2,7 +2,7 @@ targets=AppBroker,AppClient
 cppflags_force=-I ../include
 cflags_force=-W
 cflags=-Wall -g -O2 -pedantic
-ldflags_force=-lSystem -L../src
+ldflags_force=-lApp -L../src
 ldflags=-L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
 dist=Makefile,README