Fixed build

This commit is contained in:
Pierre Pronchery 2011-03-28 00:02:42 +00:00
parent ccf0c6ab0e
commit d38bc8e585
11 changed files with 14 additions and 9 deletions

View File

@ -19,7 +19,7 @@
# define LIBAPP_APPCLIENT_H # define LIBAPP_APPCLIENT_H
# include <stdint.h> # include <stdint.h>
# include "event.h" # include <System/event.h>
/* AppClient */ /* AppClient */

View File

@ -18,7 +18,7 @@
#ifndef LIBAPP_APPSERVER_H #ifndef LIBAPP_APPSERVER_H
# define LIBAPP_APPSERVER_H # define LIBAPP_APPSERVER_H
# include "event.h" # include <System/event.h>
/* AppServer */ /* AppServer */

View File

@ -20,7 +20,7 @@ all: $(TARGETS)
libApp_OBJS = appclient.o appinterface.o appserver.o libApp_OBJS = appclient.o appinterface.o appserver.o
libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lssl libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem` -lssl
libApp.a: $(libApp_OBJS) libApp.a: $(libApp_OBJS)
$(AR) libApp.a $(libApp_OBJS) $(AR) libApp.a $(libApp_OBJS)

View File

@ -31,7 +31,8 @@
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/err.h> # include <openssl/err.h>
#endif #endif
#include "System.h" #include <System.h>
#include "System/App.h"
#include "appinterface.h" #include "appinterface.h"

View File

@ -28,7 +28,8 @@
# include <openssl/ssl.h> # include <openssl/ssl.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include "System.h" #include <System.h>
#include "System/App.h"
#include "appinterface.h" #include "appinterface.h"
#include "../config.h" #include "../config.h"

View File

@ -31,7 +31,8 @@
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/err.h> # include <openssl/err.h>
#endif #endif
#include "System.h" #include <System.h>
#include "System/App.h"
#include "appinterface.h" #include "appinterface.h"
#include "../config.h" #include "../config.h"

View File

@ -8,5 +8,5 @@ dist=Makefile,appinterface.h
[libApp] [libApp]
type=library type=library
sources=appclient.c,appinterface.c,appserver.c sources=appclient.c,appinterface.c,appserver.c
ldflags=-lssl ldflags=`pkg-config --libs libSystem` -lssl
install=$(LIBDIR) install=$(LIBDIR)

View File

@ -7,7 +7,7 @@ CPPFLAGSF= -I ../include
CPPFLAGS= CPPFLAGS=
CFLAGSF = -W CFLAGSF = -W
CFLAGS = -Wall -g -O2 -pedantic CFLAGS = -Wall -g -O2 -pedantic
LDFLAGSF= -lSystem -L../src LDFLAGSF= -lApp -L../src
LDFLAGS = -L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib LDFLAGS = -L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f

View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <System.h> #include <System.h>
#include "System/App.h"
#define APPBROKER_PROGNAME "AppBroker" #define APPBROKER_PROGNAME "AppBroker"

View File

@ -21,6 +21,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <System.h> #include <System.h>
#include "System/App.h"
#define APPCLIENT_PROGNAME "AppClient" #define APPCLIENT_PROGNAME "AppClient"

View File

@ -2,7 +2,7 @@ targets=AppBroker,AppClient
cppflags_force=-I ../include cppflags_force=-I ../include
cflags_force=-W cflags_force=-W
cflags=-Wall -g -O2 -pedantic cflags=-Wall -g -O2 -pedantic
ldflags_force=-lSystem -L../src ldflags_force=-lApp -L../src
ldflags=-L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib ldflags=-L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
dist=Makefile,README dist=Makefile,README