From 19c6a05d4eeb0478c002e3473770d0f51f2ff45c Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 30 Aug 2012 17:12:40 +0000
Subject: [PATCH] Compilation fixes for case-insensitive filesystems (like
 MacOS X)

---
 src/Makefile       | 2 +-
 src/common.c       | 4 ++--
 src/project.conf   | 1 -
 src/vpn.c          | 4 ++--
 tools/Makefile     | 4 ++--
 tools/project.conf | 3 +--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 90efc78..ed85a9f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@ PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	?= cc
-CPPFLAGSF= -I ../include
+CPPFLAGSF?=
 CPPFLAGS=
 CFLAGSF	= -W `pkg-config --cflags libApp`
 CFLAGS	= -Wall -g -O2 -pedantic
diff --git a/src/common.c b/src/common.c
index b4fed56..1138f40 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS System VPN */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 
 
 
-#include "VPN.h"
+#include "../include/VPN.h"
 
 
 /* types */
diff --git a/src/project.conf b/src/project.conf
index 2a33ab3..1efd0c7 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,5 +1,4 @@
 targets=../include/VPN.h,VPN
-cppflags_force=-I ../include
 cppflags=
 cflags_force=-W `pkg-config --cflags libApp`
 cflags=-Wall -g -O2 -pedantic
diff --git a/src/vpn.c b/src/vpn.c
index 0d0e466..44bc48a 100644
--- a/src/vpn.c
+++ b/src/vpn.c
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
+/* Copyright (c) 2010-2012 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS System VPN */
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <System.h>
-#include "VPN.h"
+#include "../include/VPN.h"
 #include "vpn.h"
 #include "../config.h"
 
diff --git a/tools/Makefile b/tools/Makefile
index 7133aa1..6af37de 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@ PREFIX	= /usr/local
 DESTDIR	=
 LIBDIR	= $(PREFIX)/lib
 CC	?= cc
-CPPFLAGSF= -I ../include
+CPPFLAGSF?=
 CPPFLAGS= -I $(PREFIX)/include
 CFLAGSF	= -W -fPIC `pkg-config --cflags libApp`
 CFLAGS	= -Wall -g -O2 -pedantic
@@ -27,7 +27,7 @@ libVPN_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 libVPN.so: $(libVPN_OBJS)
 	$(CCSHARED) -o libVPN.so $(libVPN_OBJS) $(libVPN_LDFLAGS)
 
-libvpn.o: libvpn.c ../include/VPN.h
+libvpn.o: libvpn.c ../include/VPN.h ../src/common.c
 	$(CC) $(libVPN_CFLAGS) -c libvpn.c
 
 clean:
diff --git a/tools/project.conf b/tools/project.conf
index 38dd171..63ee88e 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,5 +1,4 @@
 targets=libVPN
-cppflags_force=-I ../include
 cppflags=-I $(PREFIX)/include
 cflags_force=-W -fPIC `pkg-config --cflags libApp`
 cflags=-Wall -g -O2 -pedantic
@@ -13,4 +12,4 @@ sources=libvpn.c
 install=$(PREFIX)/lib/AppWrapper
 
 [libvpn.c]
-depends=../include/VPN.h
+depends=../include/VPN.h,../src/common.c