New organisation of the source tree

- separate tests directory - regroup modbus.h and modbus.c in the same dir - updated waf scripts - updated autotools files - bump application version to 1.9.0 - bump library number to 2.0.0

New organisation of the source tree
- separate tests directory - regroup modbus.h and modbus.c in the same dir - updated waf scripts - updated autotools files - bump application version to 1.9.0 - bump library number to 2.0.0
Stéphane Raimbault
1 parent 3647a435
Showing 13 changed files with 40 additions and 36 deletions
Makefile.am
configure.ac
include/Makefile.am
include/modbus/Makefile.am → modbus/Makefile.am
src/modbus.c → modbus/modbus.c
include/modbus/modbus.h → modbus/modbus.h
modbus/wscript
src/Makefile.am
tests/Makefile.am
src/test-modbus-master.c → tests/test-modbus-master.c
src/test-modbus-slave.c → tests/test-modbus-slave.c
src/wscript → tests/wscript
wscript
-SUBDIRS = include src
+SUBDIRS = modbus tests
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modbus.pc
@@ -24,11 +24,9 @@ AC_FUNC_MALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([inet_ntoa memset select socket])
-AC_SUBST(modbus_pkgdeps)
 AC_OUTPUT([
 Makefile
-src/Makefile
-include/Makefile
-include/modbus/Makefile
+modbus/Makefile
+tests/Makefile
 modbus.pc
 ])
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = modbus
-## Process this file with automake to produce Makefile.in
+lib_LTLIBRARIES = libmodbus.la
+libmodbus_la_SOURCES = modbus.c modbus.h
+libmodbus_la_LDFLAGS = -version-info 2:0:0
 # Include files to install
 libmodbusincludedir = $(includedir)/modbus
-libmodbusinclude_HEADERS = modbus.h
 \ No newline at end of file
+libmodbusinclude_HEADERS = modbus.h
+
+INCLUDES = -I$(top_srcdir)
+CLEANFILES = *~
+def build(bld):
+    obj = bld.create_obj('cc', 'shlib')
+    obj.source = 'modbus.c'
+    obj.includes = '.'
+    obj.target = 'modbus'
+    obj.vnum = '2.0.0'
+
+    install_files('PREFIX', 'include/modbus', 'modbus.h')
-lib_LTLIBRARIES = libmodbus.la
-libmodbus_la_SOURCES = modbus.c modbus.h
-
-bin_PROGRAMS = test-modbus-master test-modbus-slave
-test_modbus_master_SOURCES = test-modbus-master.c
-test_modbus_master_LDADD = libmodbus.la
-
-test_modbus_slave_SOURCES = test-modbus-slave.c
-test_modbus_slave_LDADD = libmodbus.la
-
-INCLUDES = -I$(top_srcdir)/include
-CLEANFILES = *~
+noinst_PROGRAMS = \
+	test-modbus-master \
+	test-modbus-slave
+
+common_ldflags = \
+	$(top_builddir)/modbus/libmodbus.la
+
+test_modbus_master_SOURCES = test-modbus-master.c
+test_modbus_master_LDADD = $(common_ldflags)
+
+test_modbus_slave_SOURCES = test-modbus-slave.c
+test_modbus_slave_LDADD = $(common_ldflags)
+
+INCLUDES = -I$(top_srcdir)
+CLEANFILES = *~
 def build(bld):
-    obj = bld.create_obj('cc', 'shlib')
-    obj.source = 'modbus.c'
-    obj.includes = '.'
-    obj.uselib = 'GLIB'
-    obj.target = 'modbus'
-    obj.vnum = '1.2.4'
-
     obj = bld.create_obj('cc', 'program')
     obj.source = 'test-modbus-master.c'
     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.uselib_local = 'modbus'
     obj.target = 'test-modbus-slave'
+    obj.inst_var = 0
@@ -8,9 +8,6 @@ APPNAME=&#39;libmodbus&#39;
 srcdir = '.'
 blddir = 'build'
-def init():
-     print "A groovy libmodbus for Linux!"
-
 def set_options(opt):
      # options provided by the modules
      opt.tool_options('compiler_cc')
@@ -51,17 +48,18 @@ def configure(conf):
 def build(bld):
      import misc
-     bld.add_subdirs('src')  
+     bld.add_subdirs('modbus tests')  
      obj = bld.create_obj('subst')
      obj.source = 'modbus.pc.in'
      obj.target = 'modbus.pc'
-    
      obj.dict = {'VERSION' : VERSION, 
                  'prefix': bld.env()['PREFIX'], 
                  'exec_prefix': bld.env()['PREFIX'],
-                 'libdir': bld.env()['PREFIX'] + '/lib', 
-                 'includedir': bld.env()['PREFIX'] + '/include'}
+                 'libdir': bld.env()['PREFIX'] + 'lib', 
+                 'includedir': bld.env()['PREFIX'] + 'include'}
+
+     install_files('PREFIX', 'lib/pkgconfig', 'modbus.pc')
 def shutdown():
      import UnitTest