From 6a9d24b10ae58c1c938011e2b174e657bca31258 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 19:05:33 +0100 Subject: [PATCH] Move location drivers to location/drivers/ --- Makefile.common | 2 +- griffin/griffin.c | 4 ++-- location/{ => drivers}/android.c | 2 +- location/{ => drivers}/nulllocation.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename location/{ => drivers}/android.c (99%) rename location/{ => drivers}/nulllocation.c (98%) diff --git a/Makefile.common b/Makefile.common index e792ed42bb..d86e149789 100644 --- a/Makefile.common +++ b/Makefile.common @@ -141,7 +141,7 @@ OBJ += frontend/frontend.o \ audio/resamplers/sinc.o \ audio/resamplers/nearest.o \ audio/resamplers/cc_resampler.o \ - location/nulllocation.o \ + location/drivers/nulllocation.o \ camera/drivers/nullcamera.o \ gfx/drivers/nullgfx.o \ audio/drivers/nullaudio.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index ee257c3bfc..72e4305674 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -433,10 +433,10 @@ CAMERA LOCATION ============================================================ */ #if defined(ANDROID) -#include "../location/android.c" +#include "../location/drivers/android.c" #endif -#include "../location/nulllocation.c" +#include "../location/drivers/nulllocation.c" /*============================================================ RSOUND diff --git a/location/android.c b/location/drivers/android.c similarity index 99% rename from location/android.c rename to location/drivers/android.c index 031f7a1869..959dd8b160 100644 --- a/location/android.c +++ b/location/drivers/android.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "../driver.h" +#include "../../driver.h" typedef struct android_location { diff --git a/location/nulllocation.c b/location/drivers/nulllocation.c similarity index 98% rename from location/nulllocation.c rename to location/drivers/nulllocation.c index 55ab50cc9f..1507ed3f94 100644 --- a/location/nulllocation.c +++ b/location/drivers/nulllocation.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "../driver.h" +#include "../../driver.h" static void *null_location_init(void) {