Commit 95d3841d8764cd4e42181b96f9713b75a8515113

Authored by Stéphane Raimbault
1 parent 4771381e

Fix Waf compilation (path to modbus.h)

modbus/Makefile.am
... ... @@ -6,5 +6,4 @@ libmodbus_la_LDFLAGS = -version-info 2:0:0
6 6 libmodbusincludedir = $(includedir)/modbus
7 7 libmodbusinclude_HEADERS = modbus.h
8 8  
9   -INCLUDES = -I$(top_srcdir)
10 9 CLEANFILES = *~
... ...
modbus/modbus.c
... ... @@ -46,7 +46,7 @@
46 46 #include <netinet/ip.h>
47 47 #include <netinet/tcp.h>
48 48  
49   -#include <modbus/modbus.h>
  49 +#include "modbus.h"
50 50  
51 51 #define UNKNOWN_ERROR_MSG "Not defined in modbus specification"
52 52  
... ...
tests/wscript
1 1 def build(bld):
2 2 obj = bld.create_obj('cc', 'program')
3 3 obj.source = 'test-modbus-master.c'
4   - obj.includes = '.'
  4 + obj.includes = '. ..'
5 5 obj.uselib_local = 'modbus'
6 6 obj.target = 'test-modbus-master'
7 7 obj.inst_var = 0
8 8  
9 9 obj = bld.create_obj('cc', 'program')
10 10 obj.source = 'test-modbus-slave.c'
11   - obj.includes = '.'
  11 + obj.includes = '. ..'
12 12 obj.uselib_local = 'modbus'
13 13 obj.target = 'test-modbus-slave'
14 14 obj.inst_var = 0
... ...