소스 검색

Fix Waf compilation (path to modbus.h)

Stéphane Raimbault 17 년 전
부모
커밋
95d3841d87
3개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 1
      modbus/Makefile.am
  2. 1 1
      modbus/modbus.c
  3. 2 2
      tests/wscript

+ 0 - 1
modbus/Makefile.am

@@ -6,5 +6,4 @@ libmodbus_la_LDFLAGS = -version-info 2:0:0
 libmodbusincludedir = $(includedir)/modbus
 libmodbusinclude_HEADERS = modbus.h
 
-INCLUDES = -I$(top_srcdir)
 CLEANFILES = *~

+ 1 - 1
modbus/modbus.c

@@ -46,7 +46,7 @@
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
-#include <modbus/modbus.h>
+#include "modbus.h"
 
 #define UNKNOWN_ERROR_MSG "Not defined in modbus specification"
 

+ 2 - 2
tests/wscript

@@ -1,14 +1,14 @@
 def build(bld):
     obj = bld.create_obj('cc', 'program')
     obj.source = 'test-modbus-master.c'
-    obj.includes = '.'
+    obj.includes = '. ..'
     obj.uselib_local = 'modbus'
     obj.target = 'test-modbus-master'
     obj.inst_var = 0
 
     obj = bld.create_obj('cc', 'program')
     obj.source = 'test-modbus-slave.c'
-    obj.includes = '.'
+    obj.includes = '. ..'
     obj.uselib_local = 'modbus'
     obj.target = 'test-modbus-slave'
     obj.inst_var = 0