diff --git a/debian/control b/debian/control index d5b94ec..fa51c17 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libmbus Priority: extra Maintainer: Robert Johansson -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf +Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf Standards-Version: 3.8.4 Section: libs Homepage: http://www.rscada.se/libmbus diff --git a/debian/files b/debian/files deleted file mode 100644 index fe9e249..0000000 --- a/debian/files +++ /dev/null @@ -1,2 +0,0 @@ -libmbus-dev_0.8.0_amd64.deb libdevel extra -libmbus1_0.8.0_amd64.deb libs extra diff --git a/debian/libmbus-dev.install b/debian/libmbus-dev.install index f882277..f6e83a8 100644 --- a/debian/libmbus-dev.install +++ b/debian/libmbus-dev.install @@ -2,3 +2,4 @@ usr/include/* usr/lib/lib*.a usr/lib/lib*.so usr/lib/*.la +usr/lib/pkgconfig/libmbus.pc diff --git a/debian/rules b/debian/rules index 52100f9..f2f150f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh --with autoreconf $@ #override_dh_auto_configure: # dh_auto_configure -- --prefix=/usr/local/freescada diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h index b9dc6bf..c219ab2 100755 --- a/mbus/mbus-protocol-aux.h +++ b/mbus/mbus-protocol-aux.h @@ -67,6 +67,10 @@ #include "mbus-protocol.h" +#ifdef __cplusplus +extern "C" { +#endif + #define MBUS_PROBE_NOTHING 0 #define MBUS_PROBE_SINGLE 1 #define MBUS_PROBE_COLLISION 2 @@ -467,4 +471,8 @@ int mbus_scan_2nd_address_range(mbus_handle * handle, int pos, char *addr_mask); */ size_t mbus_hex2bin(u_char * dst, size_t dst_len, const u_char * src, size_t src_len); +#ifdef __cplusplus +} +#endif + #endif // __MBUS_PROTOCOL_AUX_H__ diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h index 0f4b006..bd6192f 100755 --- a/mbus/mbus-protocol.h +++ b/mbus/mbus-protocol.h @@ -21,6 +21,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + // // Packet formats: // @@ -632,5 +636,9 @@ u_char mbus_dif_datalength_lookup(u_char dif); char *mbus_frame_get_secondary_address(mbus_frame *frame); int mbus_frame_select_secondary_pack(mbus_frame *frame, char *address); +#ifdef __cplusplus +} +#endif + #endif /* _MBUS_PROTOCOL_H_ */ diff --git a/mbus/mbus-serial.h b/mbus/mbus-serial.h index 6203784..4080aef 100755 --- a/mbus/mbus-serial.h +++ b/mbus/mbus-serial.h @@ -22,6 +22,11 @@ #include "mbus-protocol-aux.h" #include "mbus-protocol.h" +#ifdef __cplusplus +extern "C" { +#endif + + typedef struct _mbus_serial_data { char *device; @@ -34,6 +39,11 @@ int mbus_serial_send_frame(mbus_handle *handle, mbus_frame *fram int mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame); int mbus_serial_set_baudrate(mbus_handle *handle, int baudrate); void mbus_serial_data_free(mbus_handle *handle); + +#ifdef __cplusplus +} +#endif + #endif /* MBUS_SERIAL_H */ diff --git a/mbus/mbus-tcp.h b/mbus/mbus-tcp.h index 6de12a7..085c9dc 100755 --- a/mbus/mbus-tcp.h +++ b/mbus/mbus-tcp.h @@ -21,6 +21,11 @@ #include "mbus-protocol.h" #include "mbus-protocol-aux.h" +#ifdef __cplusplus +extern "C" { + #endif + + typedef struct _mbus_tcp_data { char *host; @@ -33,6 +38,10 @@ int mbus_tcp_send_frame(mbus_handle *handle, mbus_frame *frame); int mbus_tcp_recv_frame(mbus_handle *handle, mbus_frame *frame); void mbus_tcp_data_free(mbus_handle *handle); +#ifdef __cplusplus +} +#endif + #endif /* MBUS_TCP_H */ diff --git a/mbus/mbus.h b/mbus/mbus.h index 8f3efc1..3dae6aa 100644 --- a/mbus/mbus.h +++ b/mbus/mbus.h @@ -38,9 +38,17 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + // // // int mbus_init(); +#ifdef __cplusplus +} +#endif + #endif /* _MBUS_H_ */