diff --git a/Makefile.am b/Makefile.am index 6077aeb..1d1db02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src examples +SUBDIRS = include src examples ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 75c1049..aa676e9 100644 --- a/configure.ac +++ b/configure.ac @@ -87,8 +87,10 @@ AC_SUBST([DC_VERSION_LIBTOOL],[dc_version_lt_current:dc_version_lt_revision:dc_v AC_CONFIG_FILES([ libdivecomputer.pc Makefile + include/Makefile + include/libdivecomputer/Makefile + include/libdivecomputer/version.h src/Makefile - src/version.h src/libdivecomputer.rc examples/Makefile ]) diff --git a/examples/Makefile.am b/examples/Makefile.am index 8053efc..8db96b0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include LDADD = $(top_builddir)/src/libdivecomputer.la bin_PROGRAMS = \ diff --git a/examples/common.h b/examples/common.h index 7d73621..662baf1 100644 --- a/examples/common.h +++ b/examples/common.h @@ -22,7 +22,7 @@ #ifndef EXAMPLES_COMMON_H #define EXAMPLES_COMMON_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/examples/cressi_edy_test.c b/examples/cressi_edy_test.c index 82bca9f..917e400 100644 --- a/examples/cressi_edy_test.c +++ b/examples/cressi_edy_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "cressi_edy.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/hw_frog_test.c b/examples/hw_frog_test.c index d323905..7aee71c 100644 --- a/examples/hw_frog_test.c +++ b/examples/hw_frog_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "hw_frog.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/hw_ostc_test.c b/examples/hw_ostc_test.c index 73660c2..32ccfa2 100644 --- a/examples/hw_ostc_test.c +++ b/examples/hw_ostc_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "hw_ostc.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/mares_darwin_test.c b/examples/mares_darwin_test.c index c890d2d..e158af1 100644 --- a/examples/mares_darwin_test.c +++ b/examples/mares_darwin_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "mares_darwin.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/mares_iconhd_test.c b/examples/mares_iconhd_test.c index 0aca5b3..b975f25 100644 --- a/examples/mares_iconhd_test.c +++ b/examples/mares_iconhd_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "mares_iconhd.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/mares_nemo_test.c b/examples/mares_nemo_test.c index 728a69e..1f637ca 100644 --- a/examples/mares_nemo_test.c +++ b/examples/mares_nemo_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "mares_nemo.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/mares_puck_test.c b/examples/mares_puck_test.c index f68dd36..e10c041 100644 --- a/examples/mares_puck_test.c +++ b/examples/mares_puck_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "mares_puck.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/oceanic_atom2_test.c b/examples/oceanic_atom2_test.c index 443554e..89a11db 100644 --- a/examples/oceanic_atom2_test.c +++ b/examples/oceanic_atom2_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "oceanic_atom2.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/oceanic_veo250_test.c b/examples/oceanic_veo250_test.c index 102ded4..bcda229 100644 --- a/examples/oceanic_veo250_test.c +++ b/examples/oceanic_veo250_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "oceanic_veo250.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/oceanic_vtpro_test.c b/examples/oceanic_vtpro_test.c index f468da0..c02825d 100644 --- a/examples/oceanic_vtpro_test.c +++ b/examples/oceanic_vtpro_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "oceanic_vtpro.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/reefnet_sensus_test.c b/examples/reefnet_sensus_test.c index 2f4a8bf..6b776b1 100644 --- a/examples/reefnet_sensus_test.c +++ b/examples/reefnet_sensus_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include // time -#include "reefnet_sensus.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/reefnet_sensuspro_test.c b/examples/reefnet_sensuspro_test.c index 5270fcd..bfcc791 100644 --- a/examples/reefnet_sensuspro_test.c +++ b/examples/reefnet_sensuspro_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include // time -#include "reefnet_sensuspro.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/reefnet_sensusultra_test.c b/examples/reefnet_sensusultra_test.c index c4f6803..a88bd3c 100644 --- a/examples/reefnet_sensusultra_test.c +++ b/examples/reefnet_sensusultra_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include // time -#include "reefnet_sensusultra.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/suunto_d9_test.c b/examples/suunto_d9_test.c index 8899676..ab58990 100644 --- a/examples/suunto_d9_test.c +++ b/examples/suunto_d9_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "suunto_d9.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/suunto_eon_test.c b/examples/suunto_eon_test.c index 6c6498e..188a99e 100644 --- a/examples/suunto_eon_test.c +++ b/examples/suunto_eon_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "suunto_eon.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/suunto_solution_test.c b/examples/suunto_solution_test.c index 8948a0e..517ef9d 100644 --- a/examples/suunto_solution_test.c +++ b/examples/suunto_solution_test.c @@ -1,7 +1,7 @@ #include // fopen, fwrite, fclose -#include "suunto.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/suunto_vyper2_test.c b/examples/suunto_vyper2_test.c index 9f5740e..6be54df 100644 --- a/examples/suunto_vyper2_test.c +++ b/examples/suunto_vyper2_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "suunto_vyper2.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/suunto_vyper_test.c b/examples/suunto_vyper_test.c index df0106d..a80234a 100644 --- a/examples/suunto_vyper_test.c +++ b/examples/suunto_vyper_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include // atoi -#include "suunto_vyper.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/universal.c b/examples/universal.c index 5a25622..2d86dc0 100644 --- a/examples/universal.c +++ b/examples/universal.c @@ -34,16 +34,16 @@ #define DC_TICKS_FORMAT "%lld" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "common.h" diff --git a/examples/uwatec_aladin_test.c b/examples/uwatec_aladin_test.c index bd8faba..d6b182c 100644 --- a/examples/uwatec_aladin_test.c +++ b/examples/uwatec_aladin_test.c @@ -1,7 +1,7 @@ #include // fopen, fwrite, fclose -#include "uwatec_aladin.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/uwatec_memomouse_test.c b/examples/uwatec_memomouse_test.c index f2224b9..3d04ead 100644 --- a/examples/uwatec_memomouse_test.c +++ b/examples/uwatec_memomouse_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "uwatec_memomouse.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/uwatec_smart_test.c b/examples/uwatec_smart_test.c index 61592a1..a42b239 100644 --- a/examples/uwatec_smart_test.c +++ b/examples/uwatec_smart_test.c @@ -23,8 +23,8 @@ #include // malloc, free #include // memset -#include "uwatec_smart.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/examples/zeagle_n2ition3_test.c b/examples/zeagle_n2ition3_test.c index 5900c57..e665de8 100644 --- a/examples/zeagle_n2ition3_test.c +++ b/examples/zeagle_n2ition3_test.c @@ -21,8 +21,8 @@ #include // fopen, fwrite, fclose -#include "zeagle_n2ition3.h" -#include "utils.h" +#include +#include #include "common.h" diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..518e21f --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = libdivecomputer diff --git a/include/libdivecomputer/Makefile.am b/include/libdivecomputer/Makefile.am new file mode 100644 index 0000000..bf57fd1 --- /dev/null +++ b/include/libdivecomputer/Makefile.am @@ -0,0 +1,41 @@ +libdivecomputerdir = $(includedir)/libdivecomputer +libdivecomputer_HEADERS = \ + version.h \ + utils.h \ + buffer.h \ + device.h \ + parser.h \ + datetime.h \ + units.h \ + suunto.h \ + suunto_solution.h \ + suunto_eon.h \ + suunto_vyper.h \ + suunto_vyper2.h \ + suunto_d9.h \ + reefnet.h \ + reefnet_sensus.h \ + reefnet_sensuspro.h \ + reefnet_sensusultra.h \ + uwatec.h \ + uwatec_aladin.h \ + uwatec_memomouse.h \ + uwatec_smart.h \ + oceanic.h \ + oceanic_atom2.h \ + oceanic_veo250.h \ + oceanic_vtpro.h \ + mares.h \ + mares_nemo.h \ + mares_puck.h \ + mares_darwin.h \ + mares_iconhd.h \ + hw.h \ + hw_ostc.h \ + hw_frog.h \ + cressi.h \ + cressi_edy.h \ + zeagle.h \ + zeagle_n2ition3.h \ + atomics.h \ + atomics_cobalt.h diff --git a/src/atomics.h b/include/libdivecomputer/atomics.h similarity index 100% rename from src/atomics.h rename to include/libdivecomputer/atomics.h diff --git a/src/atomics_cobalt.h b/include/libdivecomputer/atomics_cobalt.h similarity index 100% rename from src/atomics_cobalt.h rename to include/libdivecomputer/atomics_cobalt.h diff --git a/src/buffer.h b/include/libdivecomputer/buffer.h similarity index 100% rename from src/buffer.h rename to include/libdivecomputer/buffer.h diff --git a/src/cressi.h b/include/libdivecomputer/cressi.h similarity index 100% rename from src/cressi.h rename to include/libdivecomputer/cressi.h diff --git a/src/cressi_edy.h b/include/libdivecomputer/cressi_edy.h similarity index 100% rename from src/cressi_edy.h rename to include/libdivecomputer/cressi_edy.h diff --git a/src/datetime.h b/include/libdivecomputer/datetime.h similarity index 100% rename from src/datetime.h rename to include/libdivecomputer/datetime.h diff --git a/src/device.h b/include/libdivecomputer/device.h similarity index 100% rename from src/device.h rename to include/libdivecomputer/device.h diff --git a/src/hw.h b/include/libdivecomputer/hw.h similarity index 100% rename from src/hw.h rename to include/libdivecomputer/hw.h diff --git a/src/hw_frog.h b/include/libdivecomputer/hw_frog.h similarity index 100% rename from src/hw_frog.h rename to include/libdivecomputer/hw_frog.h diff --git a/src/hw_ostc.h b/include/libdivecomputer/hw_ostc.h similarity index 100% rename from src/hw_ostc.h rename to include/libdivecomputer/hw_ostc.h diff --git a/src/mares.h b/include/libdivecomputer/mares.h similarity index 100% rename from src/mares.h rename to include/libdivecomputer/mares.h diff --git a/src/mares_darwin.h b/include/libdivecomputer/mares_darwin.h similarity index 100% rename from src/mares_darwin.h rename to include/libdivecomputer/mares_darwin.h diff --git a/src/mares_iconhd.h b/include/libdivecomputer/mares_iconhd.h similarity index 100% rename from src/mares_iconhd.h rename to include/libdivecomputer/mares_iconhd.h diff --git a/src/mares_nemo.h b/include/libdivecomputer/mares_nemo.h similarity index 100% rename from src/mares_nemo.h rename to include/libdivecomputer/mares_nemo.h diff --git a/src/mares_puck.h b/include/libdivecomputer/mares_puck.h similarity index 100% rename from src/mares_puck.h rename to include/libdivecomputer/mares_puck.h diff --git a/src/oceanic.h b/include/libdivecomputer/oceanic.h similarity index 100% rename from src/oceanic.h rename to include/libdivecomputer/oceanic.h diff --git a/src/oceanic_atom2.h b/include/libdivecomputer/oceanic_atom2.h similarity index 100% rename from src/oceanic_atom2.h rename to include/libdivecomputer/oceanic_atom2.h diff --git a/src/oceanic_veo250.h b/include/libdivecomputer/oceanic_veo250.h similarity index 100% rename from src/oceanic_veo250.h rename to include/libdivecomputer/oceanic_veo250.h diff --git a/src/oceanic_vtpro.h b/include/libdivecomputer/oceanic_vtpro.h similarity index 100% rename from src/oceanic_vtpro.h rename to include/libdivecomputer/oceanic_vtpro.h diff --git a/src/parser.h b/include/libdivecomputer/parser.h similarity index 100% rename from src/parser.h rename to include/libdivecomputer/parser.h diff --git a/src/reefnet.h b/include/libdivecomputer/reefnet.h similarity index 100% rename from src/reefnet.h rename to include/libdivecomputer/reefnet.h diff --git a/src/reefnet_sensus.h b/include/libdivecomputer/reefnet_sensus.h similarity index 100% rename from src/reefnet_sensus.h rename to include/libdivecomputer/reefnet_sensus.h diff --git a/src/reefnet_sensuspro.h b/include/libdivecomputer/reefnet_sensuspro.h similarity index 100% rename from src/reefnet_sensuspro.h rename to include/libdivecomputer/reefnet_sensuspro.h diff --git a/src/reefnet_sensusultra.h b/include/libdivecomputer/reefnet_sensusultra.h similarity index 100% rename from src/reefnet_sensusultra.h rename to include/libdivecomputer/reefnet_sensusultra.h diff --git a/src/suunto.h b/include/libdivecomputer/suunto.h similarity index 100% rename from src/suunto.h rename to include/libdivecomputer/suunto.h diff --git a/src/suunto_d9.h b/include/libdivecomputer/suunto_d9.h similarity index 100% rename from src/suunto_d9.h rename to include/libdivecomputer/suunto_d9.h diff --git a/src/suunto_eon.h b/include/libdivecomputer/suunto_eon.h similarity index 100% rename from src/suunto_eon.h rename to include/libdivecomputer/suunto_eon.h diff --git a/src/suunto_solution.h b/include/libdivecomputer/suunto_solution.h similarity index 100% rename from src/suunto_solution.h rename to include/libdivecomputer/suunto_solution.h diff --git a/src/suunto_vyper.h b/include/libdivecomputer/suunto_vyper.h similarity index 100% rename from src/suunto_vyper.h rename to include/libdivecomputer/suunto_vyper.h diff --git a/src/suunto_vyper2.h b/include/libdivecomputer/suunto_vyper2.h similarity index 100% rename from src/suunto_vyper2.h rename to include/libdivecomputer/suunto_vyper2.h diff --git a/src/units.h b/include/libdivecomputer/units.h similarity index 100% rename from src/units.h rename to include/libdivecomputer/units.h diff --git a/src/utils.h b/include/libdivecomputer/utils.h similarity index 100% rename from src/utils.h rename to include/libdivecomputer/utils.h diff --git a/src/uwatec.h b/include/libdivecomputer/uwatec.h similarity index 100% rename from src/uwatec.h rename to include/libdivecomputer/uwatec.h diff --git a/src/uwatec_aladin.h b/include/libdivecomputer/uwatec_aladin.h similarity index 100% rename from src/uwatec_aladin.h rename to include/libdivecomputer/uwatec_aladin.h diff --git a/src/uwatec_memomouse.h b/include/libdivecomputer/uwatec_memomouse.h similarity index 100% rename from src/uwatec_memomouse.h rename to include/libdivecomputer/uwatec_memomouse.h diff --git a/src/uwatec_smart.h b/include/libdivecomputer/uwatec_smart.h similarity index 100% rename from src/uwatec_smart.h rename to include/libdivecomputer/uwatec_smart.h diff --git a/src/version.h.in b/include/libdivecomputer/version.h.in similarity index 100% rename from src/version.h.in rename to include/libdivecomputer/version.h.in diff --git a/src/zeagle.h b/include/libdivecomputer/zeagle.h similarity index 100% rename from src/zeagle.h rename to include/libdivecomputer/zeagle.h diff --git a/src/zeagle_n2ition3.h b/include/libdivecomputer/zeagle_n2ition3.h similarity index 100% rename from src/zeagle_n2ition3.h rename to include/libdivecomputer/zeagle_n2ition3.h diff --git a/libdivecomputer.pc.in b/libdivecomputer.pc.in index b5f1274..aa45720 100644 --- a/libdivecomputer.pc.in +++ b/libdivecomputer.pc.in @@ -8,4 +8,4 @@ Description: A library for communication with various dive computers. Version: @VERSION@ Requires.private: @DEPENDENCIES@ Libs: -L${libdir} -ldivecomputer -Cflags: -I${includedir}/libdivecomputer +Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 7e6440c..949fb68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,53 +1,4 @@ -# -# Public header files. -# - -libdivecomputerdir = $(includedir)/libdivecomputer -libdivecomputer_HEADERS = \ - version.h \ - utils.h \ - buffer.h \ - device.h \ - parser.h \ - datetime.h \ - units.h \ - suunto.h \ - suunto_solution.h \ - suunto_eon.h \ - suunto_vyper.h \ - suunto_vyper2.h \ - suunto_d9.h \ - reefnet.h \ - reefnet_sensus.h \ - reefnet_sensuspro.h \ - reefnet_sensusultra.h \ - uwatec.h \ - uwatec_aladin.h \ - uwatec_memomouse.h \ - uwatec_smart.h \ - oceanic.h \ - oceanic_atom2.h \ - oceanic_veo250.h \ - oceanic_vtpro.h \ - mares.h \ - mares_nemo.h \ - mares_puck.h \ - mares_darwin.h \ - mares_iconhd.h \ - hw.h \ - hw_ostc.h \ - hw_frog.h \ - cressi.h \ - cressi_edy.h \ - zeagle.h \ - zeagle_n2ition3.h \ - atomics.h \ - atomics_cobalt.h - -# -# Source files. -# - +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libdivecomputer.la @@ -60,50 +11,41 @@ libdivecomputer_la_LDFLAGS = \ libdivecomputer_la_SOURCES = \ version.c \ - device.h device-private.h device.c \ - parser.h parser-private.h parser.c \ - datetime.h datetime.c \ - suunto.h \ + device-private.h device.c \ + parser-private.h parser.c \ + datetime.c \ suunto_common.h suunto_common.c \ suunto_common2.h suunto_common2.c \ - suunto_solution.h suunto_solution.c suunto_solution_parser.c \ - suunto_eon.h suunto_eon.c suunto_eon_parser.c \ - suunto_vyper.h suunto_vyper.c suunto_vyper_parser.c \ - suunto_vyper2.h suunto_vyper2.c \ - suunto_d9.h suunto_d9.c suunto_d9_parser.c \ - reefnet.h \ - reefnet_sensus.h reefnet_sensus.c reefnet_sensus_parser.c \ - reefnet_sensuspro.h reefnet_sensuspro.c reefnet_sensuspro_parser.c \ - reefnet_sensusultra.h reefnet_sensusultra.c reefnet_sensusultra_parser.c \ - uwatec.h \ - uwatec_aladin.h uwatec_aladin.c \ - uwatec_memomouse.h uwatec_memomouse.c uwatec_memomouse_parser.c \ - uwatec_smart.h uwatec_smart.c uwatec_smart_parser.c \ - oceanic.h \ + suunto_solution.c suunto_solution_parser.c \ + suunto_eon.c suunto_eon_parser.c \ + suunto_vyper.c suunto_vyper_parser.c \ + suunto_vyper2.c \ + suunto_d9.c suunto_d9_parser.c \ + reefnet_sensus.c reefnet_sensus_parser.c \ + reefnet_sensuspro.c reefnet_sensuspro_parser.c \ + reefnet_sensusultra.c reefnet_sensusultra_parser.c \ + uwatec_aladin.c \ + uwatec_memomouse.c uwatec_memomouse_parser.c \ + uwatec_smart.c uwatec_smart_parser.c \ oceanic_common.h oceanic_common.c \ - oceanic_atom2.h oceanic_atom2.c oceanic_atom2_parser.c \ - oceanic_veo250.h oceanic_veo250.c oceanic_veo250_parser.c \ - oceanic_vtpro.h oceanic_vtpro.c oceanic_vtpro_parser.c \ - mares.h \ + oceanic_atom2.c oceanic_atom2_parser.c \ + oceanic_veo250.c oceanic_veo250_parser.c \ + oceanic_vtpro.c oceanic_vtpro_parser.c \ mares_common.h mares_common.c \ - mares_nemo.h mares_nemo.c mares_nemo_parser.c \ - mares_puck.h mares_puck.c \ - mares_darwin.h mares_darwin.c mares_darwin_parser.c \ - mares_iconhd.h mares_iconhd.c mares_iconhd_parser.c \ - hw.h \ - hw_ostc.h hw_ostc.c hw_ostc_parser.c \ - hw_frog.h hw_frog.c \ - cressi.h \ - cressi_edy.h cressi_edy.c cressi_edy_parser.c \ - zeagle.h \ - zeagle_n2ition3.h zeagle_n2ition3.c \ - atomics.h \ - atomics_cobalt.h atomics_cobalt.c atomics_cobalt_parser.c \ + mares_nemo.c mares_nemo_parser.c \ + mares_puck.c \ + mares_darwin.c mares_darwin_parser.c \ + mares_iconhd.c mares_iconhd_parser.c \ + hw_ostc.c hw_ostc_parser.c \ + hw_frog.c \ + cressi_edy.c cressi_edy_parser.c \ + zeagle_n2ition3.c \ + atomics_cobalt.c atomics_cobalt_parser.c \ ringbuffer.h ringbuffer.c \ checksum.h checksum.c \ array.h array.c \ - buffer.h buffer.c \ - utils.h utils.c + buffer.c \ + utils.c if OS_WIN32 libdivecomputer_la_SOURCES += serial.h serial_win32.c diff --git a/src/atomics_cobalt.c b/src/atomics_cobalt.c index e7f1cde..f581955 100644 --- a/src/atomics_cobalt.c +++ b/src/atomics_cobalt.c @@ -30,10 +30,11 @@ #include #endif +#include +#include + #include "device-private.h" -#include "atomics_cobalt.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define VID 0x0471 diff --git a/src/atomics_cobalt_parser.c b/src/atomics_cobalt_parser.c index 9345705..c7d4aab 100644 --- a/src/atomics_cobalt_parser.c +++ b/src/atomics_cobalt_parser.c @@ -21,11 +21,12 @@ #include -#include "atomics_cobalt.h" +#include +#include +#include + #include "parser-private.h" -#include "utils.h" #include "array.h" -#include "units.h" #define SZ_HEADER 228 #define SZ_GASMIX 18 diff --git a/src/buffer.c b/src/buffer.c index 6baf640..5b203fb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -22,7 +22,7 @@ #include // malloc, realloc, free #include // memcpy, memmove -#include "buffer.h" +#include struct dc_buffer_t { unsigned char *data; diff --git a/src/cressi_edy.c b/src/cressi_edy.c index 732635c..8f788d2 100644 --- a/src/cressi_edy.c +++ b/src/cressi_edy.c @@ -23,10 +23,11 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" -#include "cressi_edy.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" #include "ringbuffer.h" diff --git a/src/cressi_edy_parser.c b/src/cressi_edy_parser.c index 3205de6..587b55a 100644 --- a/src/cressi_edy_parser.c +++ b/src/cressi_edy_parser.c @@ -21,9 +21,10 @@ #include -#include "cressi_edy.h" +#include +#include + #include "parser-private.h" -#include "utils.h" #include "array.h" typedef struct cressi_edy_parser_t cressi_edy_parser_t; diff --git a/src/datetime.c b/src/datetime.c index b6c3576..41aaeab 100644 --- a/src/datetime.c +++ b/src/datetime.c @@ -25,7 +25,7 @@ #include -#include "datetime.h" +#include static struct tm * dc_localtime_r (const time_t *t, struct tm *tm) diff --git a/src/device-private.h b/src/device-private.h index 20907f6..96310cc 100644 --- a/src/device-private.h +++ b/src/device-private.h @@ -24,7 +24,7 @@ #include -#include "device.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/hw_frog.c b/src/hw_frog.c index 8e3789e..be00e83 100644 --- a/src/hw_frog.c +++ b/src/hw_frog.c @@ -22,12 +22,13 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "device-private.h" -#include "hw_frog.h" #include "serial.h" #include "checksum.h" #include "ringbuffer.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/hw_ostc.c b/src/hw_ostc.c index ff112b8..19ad449 100644 --- a/src/hw_ostc.c +++ b/src/hw_ostc.c @@ -22,11 +22,12 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "device-private.h" -#include "hw_ostc.h" #include "serial.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/hw_ostc_parser.c b/src/hw_ostc_parser.c index e0258fa..dafd990 100644 --- a/src/hw_ostc_parser.c +++ b/src/hw_ostc_parser.c @@ -21,10 +21,11 @@ #include -#include "hw_ostc.h" +#include +#include + #include "parser-private.h" #include "array.h" -#include "utils.h" #define NINFO 6 diff --git a/src/irda.c b/src/irda.c index 7483d09..fb6076a 100644 --- a/src/irda.c +++ b/src/irda.c @@ -37,8 +37,9 @@ #include // ioctl #endif +#include + #include "irda.h" -#include "utils.h" #include "array.h" #ifdef _WIN32 diff --git a/src/mares_common.c b/src/mares_common.c index 5e789cd..742af05 100644 --- a/src/mares_common.c +++ b/src/mares_common.c @@ -23,9 +23,10 @@ #include // memcpy, memcmp #include // assert +#include + #include "mares_common.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/mares_darwin.c b/src/mares_darwin.c index e41f99a..793a70a 100644 --- a/src/mares_darwin.c +++ b/src/mares_darwin.c @@ -23,11 +23,12 @@ #include #include +#include +#include +#include + #include "device-private.h" #include "mares_common.h" -#include "mares_darwin.h" -#include "units.h" -#include "utils.h" #include "array.h" #define DARWIN 0 diff --git a/src/mares_darwin_parser.c b/src/mares_darwin_parser.c index ea10b69..27df4ca 100644 --- a/src/mares_darwin_parser.c +++ b/src/mares_darwin_parser.c @@ -22,10 +22,11 @@ #include #include -#include "mares_darwin.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" #define DARWIN 0 diff --git a/src/mares_iconhd.c b/src/mares_iconhd.c index 9ac25d7..7efa52f 100644 --- a/src/mares_iconhd.c +++ b/src/mares_iconhd.c @@ -22,11 +22,12 @@ #include // memcpy, memcmp #include // malloc, free +#include +#include + #include "device-private.h" -#include "mares_iconhd.h" #include "serial.h" #include "array.h" -#include "utils.h" #define EXITCODE(rc) \ ( \ diff --git a/src/mares_iconhd_parser.c b/src/mares_iconhd_parser.c index 181705a..600f550 100644 --- a/src/mares_iconhd_parser.c +++ b/src/mares_iconhd_parser.c @@ -21,9 +21,10 @@ #include -#include "mares_iconhd.h" +#include +#include + #include "parser-private.h" -#include "utils.h" #include "array.h" #define ICONHD 0x14 diff --git a/src/mares_nemo.c b/src/mares_nemo.c index 40c25dc..17b9126 100644 --- a/src/mares_nemo.c +++ b/src/mares_nemo.c @@ -22,11 +22,12 @@ #include // memcpy, memcmp #include // malloc, free +#include +#include + #include "device-private.h" #include "mares_common.h" -#include "mares_nemo.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" diff --git a/src/mares_nemo_parser.c b/src/mares_nemo_parser.c index e392ef4..e072199 100644 --- a/src/mares_nemo_parser.c +++ b/src/mares_nemo_parser.c @@ -22,10 +22,11 @@ #include #include -#include "mares_nemo.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" #define NEMO 0 diff --git a/src/mares_puck.c b/src/mares_puck.c index 6a891c4..3d5e924 100644 --- a/src/mares_puck.c +++ b/src/mares_puck.c @@ -23,11 +23,12 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" #include "mares_common.h" -#include "mares_puck.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 4231b50..4ce7aaa 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -22,11 +22,12 @@ #include // memcpy #include // malloc, free +#include +#include + #include "device-private.h" #include "oceanic_common.h" -#include "oceanic_atom2.h" #include "serial.h" -#include "utils.h" #include "array.h" #include "ringbuffer.h" #include "checksum.h" diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c index bb7cec3..c5e957d 100644 --- a/src/oceanic_atom2_parser.c +++ b/src/oceanic_atom2_parser.c @@ -21,12 +21,13 @@ #include -#include "oceanic_atom2.h" +#include +#include +#include + #include "oceanic_common.h" #include "parser-private.h" #include "array.h" -#include "units.h" -#include "utils.h" #define ATOM1 0x4250 #define EPIC 0x4257 diff --git a/src/oceanic_common.c b/src/oceanic_common.c index ef3b1eb..ceebfaf 100644 --- a/src/oceanic_common.c +++ b/src/oceanic_common.c @@ -23,11 +23,12 @@ #include // malloc, free #include // assert +#include + #include "oceanic_common.h" #include "device-private.h" #include "ringbuffer.h" #include "array.h" -#include "utils.h" #define RB_LOGBOOK_DISTANCE(a,b,l) ringbuffer_distance (a, b, 0, l->rb_logbook_begin, l->rb_logbook_end) #define RB_LOGBOOK_INCR(a,b,l) ringbuffer_increment (a, b, l->rb_logbook_begin, l->rb_logbook_end) diff --git a/src/oceanic_veo250.c b/src/oceanic_veo250.c index 80027ae..d46dfe0 100644 --- a/src/oceanic_veo250.c +++ b/src/oceanic_veo250.c @@ -22,11 +22,12 @@ #include // memcpy #include // malloc, free +#include +#include + #include "device-private.h" #include "oceanic_common.h" -#include "oceanic_veo250.h" #include "serial.h" -#include "utils.h" #include "ringbuffer.h" #include "checksum.h" diff --git a/src/oceanic_veo250_parser.c b/src/oceanic_veo250_parser.c index 0986c6b..7dcb592 100644 --- a/src/oceanic_veo250_parser.c +++ b/src/oceanic_veo250_parser.c @@ -21,12 +21,13 @@ #include -#include "oceanic_veo250.h" +#include +#include +#include + #include "oceanic_common.h" #include "parser-private.h" #include "array.h" -#include "units.h" -#include "utils.h" typedef struct oceanic_veo250_parser_t oceanic_veo250_parser_t; diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index bc6f6d8..f388e04 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -22,11 +22,12 @@ #include // memcpy #include // malloc, free +#include +#include + #include "device-private.h" #include "oceanic_common.h" -#include "oceanic_vtpro.h" #include "serial.h" -#include "utils.h" #include "ringbuffer.h" #include "checksum.h" diff --git a/src/oceanic_vtpro_parser.c b/src/oceanic_vtpro_parser.c index ab5c77d..a4da3e1 100644 --- a/src/oceanic_vtpro_parser.c +++ b/src/oceanic_vtpro_parser.c @@ -21,12 +21,13 @@ #include -#include "oceanic_vtpro.h" +#include +#include +#include + #include "oceanic_common.h" #include "parser-private.h" #include "array.h" -#include "units.h" -#include "utils.h" typedef struct oceanic_vtpro_parser_t oceanic_vtpro_parser_t; diff --git a/src/parser-private.h b/src/parser-private.h index ab57a43..6d61788 100644 --- a/src/parser-private.h +++ b/src/parser-private.h @@ -22,7 +22,7 @@ #ifndef PARSER_PRIVATE_H #define PARSER_PRIVATE_H -#include "parser.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/reefnet_sensus.c b/src/reefnet_sensus.c index 1d96d61..13260a7 100644 --- a/src/reefnet_sensus.c +++ b/src/reefnet_sensus.c @@ -22,11 +22,12 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "device-private.h" -#include "reefnet_sensus.h" #include "serial.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/reefnet_sensus_parser.c b/src/reefnet_sensus_parser.c index 185c15d..1f6605b 100644 --- a/src/reefnet_sensus_parser.c +++ b/src/reefnet_sensus_parser.c @@ -21,10 +21,11 @@ #include // malloc, free -#include "reefnet_sensus.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" #define SAMPLE_DEPTH_ADJUST 13 diff --git a/src/reefnet_sensuspro.c b/src/reefnet_sensuspro.c index 9d7c90e..be7ad90 100644 --- a/src/reefnet_sensuspro.c +++ b/src/reefnet_sensuspro.c @@ -22,11 +22,12 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "device-private.h" -#include "reefnet_sensuspro.h" #include "serial.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/reefnet_sensuspro_parser.c b/src/reefnet_sensuspro_parser.c index c0f2987..3b5346c 100644 --- a/src/reefnet_sensuspro_parser.c +++ b/src/reefnet_sensuspro_parser.c @@ -22,10 +22,11 @@ #include #include // memcmp -#include "reefnet_sensuspro.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" typedef struct reefnet_sensuspro_parser_t reefnet_sensuspro_parser_t; diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c index 976ef7c..529a9f8 100644 --- a/src/reefnet_sensusultra.c +++ b/src/reefnet_sensusultra.c @@ -23,11 +23,12 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" -#include "reefnet_sensusultra.h" #include "serial.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/reefnet_sensusultra_parser.c b/src/reefnet_sensusultra_parser.c index 4da8ba5..fff5a7d 100644 --- a/src/reefnet_sensusultra_parser.c +++ b/src/reefnet_sensusultra_parser.c @@ -22,10 +22,11 @@ #include #include // memcmp -#include "reefnet_sensusultra.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" typedef struct reefnet_sensusultra_parser_t reefnet_sensusultra_parser_t; diff --git a/src/serial_posix.c b/src/serial_posix.c index 50f09e1..f1807ba 100644 --- a/src/serial_posix.c +++ b/src/serial_posix.c @@ -43,8 +43,9 @@ #define TIOCINQ FIONREAD #endif +#include + #include "serial.h" -#include "utils.h" #define TRACE(expr) \ { \ diff --git a/src/serial_win32.c b/src/serial_win32.c index d3b9d32..8c7ef08 100644 --- a/src/serial_win32.c +++ b/src/serial_win32.c @@ -22,8 +22,9 @@ #include #include +#include + #include "serial.h" -#include "utils.h" #define TRACE(expr) \ { \ diff --git a/src/suunto_common2.c b/src/suunto_common2.c index 0a7957a..8083832 100644 --- a/src/suunto_common2.c +++ b/src/suunto_common2.c @@ -23,8 +23,9 @@ #include // memcmp, memcpy #include // assert +#include + #include "suunto_common2.h" -#include "utils.h" #include "ringbuffer.h" #include "checksum.h" #include "array.h" diff --git a/src/suunto_d9.c b/src/suunto_d9.c index 8e6298f..ac66696 100644 --- a/src/suunto_d9.c +++ b/src/suunto_d9.c @@ -23,10 +23,11 @@ #include // malloc, free #include // assert +#include +#include + #include "suunto_common2.h" -#include "suunto_d9.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" diff --git a/src/suunto_d9_parser.c b/src/suunto_d9_parser.c index 5263c9b..2088c92 100644 --- a/src/suunto_d9_parser.c +++ b/src/suunto_d9_parser.c @@ -22,9 +22,10 @@ #include #include // memcmp -#include "suunto_d9.h" +#include +#include + #include "parser-private.h" -#include "utils.h" #include "array.h" #define SKIP 4 diff --git a/src/suunto_eon.c b/src/suunto_eon.c index d915a0e..f910a12 100644 --- a/src/suunto_eon.c +++ b/src/suunto_eon.c @@ -22,12 +22,13 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "device-private.h" -#include "suunto_eon.h" #include "suunto_common.h" #include "serial.h" #include "checksum.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/suunto_eon_parser.c b/src/suunto_eon_parser.c index 25d0a87..e0c5743 100644 --- a/src/suunto_eon_parser.c +++ b/src/suunto_eon_parser.c @@ -21,10 +21,11 @@ #include -#include "suunto_eon.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" typedef struct suunto_eon_parser_t suunto_eon_parser_t; diff --git a/src/suunto_solution.c b/src/suunto_solution.c index 1e581d8..b4f1baa 100644 --- a/src/suunto_solution.c +++ b/src/suunto_solution.c @@ -21,11 +21,13 @@ #include // malloc, free +#include +#include +#include + #include "device-private.h" -#include "suunto_solution.h" #include "ringbuffer.h" #include "serial.h" -#include "utils.h" #include "array.h" #define EXITCODE(rc) \ diff --git a/src/suunto_solution_parser.c b/src/suunto_solution_parser.c index 2bc61f4..0fb6331 100644 --- a/src/suunto_solution_parser.c +++ b/src/suunto_solution_parser.c @@ -21,10 +21,11 @@ #include -#include "suunto_solution.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" typedef struct suunto_solution_parser_t suunto_solution_parser_t; diff --git a/src/suunto_vyper.c b/src/suunto_vyper.c index 6cd9124..3aac3fc 100644 --- a/src/suunto_vyper.c +++ b/src/suunto_vyper.c @@ -23,13 +23,14 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" -#include "suunto_vyper.h" #include "suunto_common.h" #include "serial.h" #include "checksum.h" #include "array.h" -#include "utils.h" #define EXITCODE(rc) \ ( \ diff --git a/src/suunto_vyper2.c b/src/suunto_vyper2.c index 7826270..0207393 100644 --- a/src/suunto_vyper2.c +++ b/src/suunto_vyper2.c @@ -22,10 +22,11 @@ #include // memcmp, memcpy #include // malloc, free +#include +#include + #include "suunto_common2.h" -#include "suunto_vyper2.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" diff --git a/src/suunto_vyper_parser.c b/src/suunto_vyper_parser.c index 8a3ebde..8cd6a01 100644 --- a/src/suunto_vyper_parser.c +++ b/src/suunto_vyper_parser.c @@ -21,10 +21,11 @@ #include -#include "suunto_vyper.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" typedef struct suunto_vyper_parser_t suunto_vyper_parser_t; diff --git a/src/utils.c b/src/utils.c index 5c14e73..fc26f13 100644 --- a/src/utils.c +++ b/src/utils.c @@ -23,7 +23,7 @@ #include #include -#include "utils.h" +#include static FILE* g_logfile = NULL; diff --git a/src/uwatec_aladin.c b/src/uwatec_aladin.c index 3df280b..b93b307 100644 --- a/src/uwatec_aladin.c +++ b/src/uwatec_aladin.c @@ -22,10 +22,11 @@ #include // malloc, free #include // memcpy +#include +#include + #include "device-private.h" -#include "uwatec_aladin.h" #include "serial.h" -#include "utils.h" #include "ringbuffer.h" #include "checksum.h" #include "array.h" diff --git a/src/uwatec_memomouse.c b/src/uwatec_memomouse.c index c4c2f41..c28cb6e 100644 --- a/src/uwatec_memomouse.c +++ b/src/uwatec_memomouse.c @@ -23,12 +23,13 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" -#include "uwatec_memomouse.h" #include "serial.h" #include "checksum.h" #include "array.h" -#include "utils.h" #define EXITCODE(rc) \ ( \ diff --git a/src/uwatec_memomouse_parser.c b/src/uwatec_memomouse_parser.c index a4cd4d7..0a16a29 100644 --- a/src/uwatec_memomouse_parser.c +++ b/src/uwatec_memomouse_parser.c @@ -21,9 +21,10 @@ #include -#include "uwatec_memomouse.h" +#include +#include + #include "parser-private.h" -#include "utils.h" #include "array.h" typedef struct uwatec_memomouse_parser_t uwatec_memomouse_parser_t; diff --git a/src/uwatec_smart.c b/src/uwatec_smart.c index 8292677..aea6606 100644 --- a/src/uwatec_smart.c +++ b/src/uwatec_smart.c @@ -22,11 +22,12 @@ #include // malloc, free #include // strncmp, strstr +#include +#include + #include "device-private.h" -#include "uwatec_smart.h" #include "irda.h" #include "array.h" -#include "utils.h" #define EXITCODE(rc) \ ( \ diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c index 4305aa4..a16c413 100644 --- a/src/uwatec_smart_parser.c +++ b/src/uwatec_smart_parser.c @@ -22,10 +22,11 @@ #include #include // memcmp -#include "uwatec_smart.h" +#include +#include +#include + #include "parser-private.h" -#include "units.h" -#include "utils.h" #include "array.h" #define NBITS 8 diff --git a/src/version.c b/src/version.c index 90e7bad..f110acf 100644 --- a/src/version.c +++ b/src/version.c @@ -19,7 +19,7 @@ * MA 02110-1301 USA */ -#include "version.h" +#include const char * dc_version (dc_version_t *version) diff --git a/src/zeagle_n2ition3.c b/src/zeagle_n2ition3.c index 8495788..0e864e1 100644 --- a/src/zeagle_n2ition3.c +++ b/src/zeagle_n2ition3.c @@ -23,10 +23,11 @@ #include // malloc, free #include // assert +#include +#include + #include "device-private.h" -#include "zeagle_n2ition3.h" #include "serial.h" -#include "utils.h" #include "checksum.h" #include "array.h" #include "ringbuffer.h"