Skip to content

Commit 3fd8595

Browse files
simonedegiacomia3f
authored andcommitted
Move Makefile up
The Makefile has been moved outside 'API', to be able to also compile files in external folders (ex: contrib)
1 parent 93979b0 commit 3fd8595

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ before_install:
1212
- tar xjf arm-2009q1-203-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
1313
- export PATH="$PWD/arm-2009q1/bin:$PATH"
1414
- sudo apt-get install -y libc6-i386
15-
- cd API
1615

1716
before_script:
1817
- test ! -e API/libev3api.a || (echo "libev3api.a shouldn't be part of version control! Aborting..."; false)

API/ev3.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ extern "C" {
4343
#include <string.h>
4444
#include <stdbool.h>
4545

46-
#include <ev3_constants.h>
47-
#include <ev3_command.h>
48-
#include <ev3_output.h>
49-
#include <ev3_sensor.h>
50-
#include <ev3_button.h>
51-
#include <ev3_lcd.h>
52-
#include <ev3_sound.h>
46+
#include "ev3_constants.h"
47+
#include "ev3_command.h"
48+
#include "ev3_output.h"
49+
#include "ev3_sensor.h"
50+
#include "ev3_button.h"
51+
#include "ev3_lcd.h"
52+
#include "ev3_sound.h"
5353

5454
// Priority of the InitEV3/FreeEV3 functions for automatic construction and destruction
5555
// see https://gcc.gnu.org/onlinedocs/gcc-4.3.3/gcc/Function-Attributes.html

API/ev3_analog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef EV3_ANALOG_H_
1919
#define EV3_ANALOG_H_
2020

21-
#include <ev3_typedata.h>
21+
#include "ev3_typedata.h"
2222

2323
/*! \page NxtColorMemory
2424
*

API/ev3_typedata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef EV3_TYPEDATA_H_
1717
#define EV3_TYPEDATA_H_
1818

19-
#include <ev3_basictypes.h>
19+
#include "ev3_basictypes.h"
2020

2121
#define MAX_DEVICE_MODES 8 //!< Max number of modes in one device
2222
#define INPUTS 4

API/Makefile renamed to Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SED = sed
88
MKDIR = mkdir -p
99
INSTALL = cp
1010
RM = rm -rf
11-
SRCS = $(wildcard *.c)
11+
SRCS = $(wildcard API/*.c)
1212
OBJS = $(patsubst %.c,%.o,$(SRCS))
1313
CFLAGS += -fno-strict-aliasing -fwrapv
1414
CFLAGS += -Wall -Wextra -Wpointer-sign -Wno-unused-parameter
@@ -18,7 +18,7 @@ libev3api.a: $(OBJS)
1818
$(AR) rcs $@ $^
1919

2020
%.o: %.c
21-
$(CC) -Os $(CFLAGS) -isystem. -c $<
21+
$(CC) -Os $(CFLAGS) -isystem. -c $< -o $@
2222

2323
libev3api.pc: libev3api.pc.in
2424
$(SED) -e "s+@PREFIX@+$(DESTDIR)+" $< > $@
@@ -41,4 +41,4 @@ example:
4141

4242
.PHONY: clean install uninstall
4343
clean:
44-
$(RM) *.o *.a *.d example
44+
$(RM) API/*.o *.a *.d example

0 commit comments

Comments
 (0)