Peter M. Groen / libmodbus

Commit df0cf7927249954f15e0aa85b02d21b990fa9af9

Authored by Stéphane Raimbault
1 parent 7a353920

Rename src to modbus 

This time the change is definitive :)
Inline Side-by-side
Showing 13 changed files with 19 additions and 19 deletions
ChangeLog deleted
View file @7a35392
Makefile.am
  View file @df0cf79
1 EXTRA_DIST = MIGRATION libmodbus.spec 1 EXTRA_DIST = MIGRATION libmodbus.spec
2 -SUBDIRS = src tests 2 +SUBDIRS = modbus tests
3 3
4 pkgconfigdir = $(libdir)/pkgconfig 4 pkgconfigdir = $(libdir)/pkgconfig
5 pkgconfig_DATA = modbus.pc 5 pkgconfig_DATA = modbus.pc
src/Makefile.am renamed to modbus/Makefile.am
  View file @df0cf79
src/modbus.c renamed to modbus/modbus.c
  View file @df0cf79
@@ -60,8 +60,8 @@ @@ -60,8 +60,8 @@
60 #define UINT16_MAX 0xFFFF 60 #define UINT16_MAX 0xFFFF
61 #endif 61 #endif
62 62
63 -#include "config.h"  
64 -#include "modbus.h" 63 +#include <config.h>
  64 +#include <modbus/modbus.h>
65 65
66 #define UNKNOWN_ERROR_MSG "Not defined in modbus specification" 66 #define UNKNOWN_ERROR_MSG "Not defined in modbus specification"
67 67
src/modbus.h renamed to modbus/modbus.h
  View file @df0cf79
tests/Makefile.am
  View file @df0cf79
@@ -10,7 +10,7 @@ noinst_PROGRAMS = \ @@ -10,7 +10,7 @@ noinst_PROGRAMS = \
10 bandwidth-master 10 bandwidth-master
11 11
12 common_ldflags = \ 12 common_ldflags = \
13 - $(top_builddir)/src/libmodbus.la 13 + $(top_builddir)/modbus/libmodbus.la
14 14
15 random_test_slave_SOURCES = random-test-slave.c 15 random_test_slave_SOURCES = random-test-slave.c
16 random_test_slave_LDADD = $(common_ldflags) 16 random_test_slave_LDADD = $(common_ldflags)
@@ -33,5 +33,5 @@ bandwidth_slave_many_up_LDADD = $(common_ldflags) @@ -33,5 +33,5 @@ bandwidth_slave_many_up_LDADD = $(common_ldflags)
33 bandwidth_master_SOURCES = bandwidth-master.c 33 bandwidth_master_SOURCES = bandwidth-master.c
34 bandwidth_master_LDADD = $(common_ldflags) 34 bandwidth_master_LDADD = $(common_ldflags)
35 35
36 -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src 36 +INCLUDES = -I$(top_srcdir)
37 CLEANFILES = *~ 37 CLEANFILES = *~
tests/bandwidth-master.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 #include <time.h> 22 #include <time.h>
23 #include <sys/time.h> 23 #include <sys/time.h>
24 24
25 -#include "modbus.h" 25 +#include <modbus/modbus.h>
26 26
27 /* Tests based on PI-MBUS-300 documentation */ 27 /* Tests based on PI-MBUS-300 documentation */
28 #define SLAVE 0x11 28 #define SLAVE 0x11
tests/bandwidth-slave-many-up.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2009 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2009-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 #include <errno.h> 22 #include <errno.h>
23 #include <signal.h> 23 #include <signal.h>
24 24
25 -#include "modbus.h" 25 +#include <modbus/modbus.h>
26 26
27 #define SLAVE 0x11 27 #define SLAVE 0x11
28 #define NB_CONNECTION 5 28 #define NB_CONNECTION 5
tests/bandwidth-slave-one.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 #include <string.h> 20 #include <string.h>
21 #include <stdlib.h> 21 #include <stdlib.h>
22 22
23 -#include "modbus.h" 23 +#include <modbus/modbus.h>
24 24
25 #define SLAVE 0x11 25 #define SLAVE 0x11
26 26
tests/random-test-master.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2001-2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2001-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 #include <string.h> 20 #include <string.h>
21 #include <stdlib.h> 21 #include <stdlib.h>
22 22
23 -#include "modbus.h" 23 +#include <modbus/modbus.h>
24 24
25 /* The goal of this program is to check all major functions of 25 /* The goal of this program is to check all major functions of
26 libmodbus: 26 libmodbus:
tests/random-test-slave.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 #include <unistd.h> 19 #include <unistd.h>
20 #include <stdlib.h> 20 #include <stdlib.h>
21 21
22 -#include "modbus.h" 22 +#include <modbus/modbus.h>
23 23
24 #define SLAVE 0x11 24 #define SLAVE 0x11
25 25
tests/unit-test-master.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 #include <string.h> 20 #include <string.h>
21 #include <stdlib.h> 21 #include <stdlib.h>
22 22
23 -#include "modbus.h" 23 +#include <modbus/modbus.h>
24 #include "unit-test.h" 24 #include "unit-test.h"
25 25
26 /* Tests based on PI-MBUS-300 documentation */ 26 /* Tests based on PI-MBUS-300 documentation */
tests/unit-test-slave.c
  View file @df0cf79
1 /* 1 /*
2 - * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> 2 + * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 #include <string.h> 20 #include <string.h>
21 #include <stdlib.h> 21 #include <stdlib.h>
22 22
23 -#include "modbus.h" 23 +#include <modbus/modbus.h>
24 #include "unit-test.h" 24 #include "unit-test.h"
25 25
26 int main(void) 26 int main(void)