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