ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix headers installation

This commit is contained in:
Emmanuel Papin 2015-06-06 10:09:43 +02:00
parent 7e8648d563
commit 717710f444
26 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -726,6 +726,11 @@ endif(zmconfgen_result EQUAL 0)
# Install zm.conf # Install zm.conf
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
if(ZM_PLUGIN_SUPPORT)
# Install config.h
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION include/zoneminder)
endif(ZM_PLUGIN_SUPPORT)
# Uninstall target # Uninstall target
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

3
src/CMakeLists.txt
View File

@ -44,6 +44,7 @@ install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE O
install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY \"\$ENV{DESTDIR}${ZM_CGIDIR}\")") install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY \"\$ENV{DESTDIR}${ZM_CGIDIR}\")")
if(ZM_PLUGIN_SUPPORT) if(ZM_PLUGIN_SUPPORT)
install(FILES jinclude.h zm_db.h zm_detector.h zm_logger.h zm_poly.h zm_mem_utils.h zm_box.h zm_ffmpeg.h zm_plugin_manager.h zm_plugin.h zm_config.h zm_config_defines.h zm_jpeg.h zm_mpeg.h zm_image_analyser.h zm_zone.h zm_rgb.h zm_utils.h zm.h zm_event.h zm_stream.h zm_coord.h zm_image.h DESTINATION include/zoneminder) install(FILES jinclude.h zm_db.h zm_detector.h zm_logger.h zm_poly.h zm_mem_utils.h zm_box.h zm_ffmpeg.h zm_plugin_manager.h zm_plugin.h zm_jpeg.h zm_mpeg.h zm_image_analyser.h zm_zone.h zm_rgb.h zm_utils.h zm_event.h zm_stream.h zm_coord.h zm_image.h DESTINATION include/zoneminder)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_config.h" "${CMAKE_CURRENT_BINARY_DIR}/zm_config_defines.h"DESTINATION include/zoneminder)
install(TARGETS zoneminder ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") install(TARGETS zoneminder ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
endif(ZM_PLUGIN_SUPPORT) endif(ZM_PLUGIN_SUPPORT)

1
src/Makefile.am
View File

@ -73,7 +73,6 @@ SOURCES_common = \
# convenience library # convenience library
HEADERS_common = \ HEADERS_common = \
jinclude.h \ jinclude.h \
zm.h \
zm_box.h \ zm_box.h \
zm_config_defines.h \ zm_config_defines.h \
zm_config.h \ zm_config.h \

1
src/zm_box.h
View File

@ -20,7 +20,6 @@
#ifndef ZM_BOX_H #ifndef ZM_BOX_H
#define ZM_BOX_H #define ZM_BOX_H
#include "zm.h"
#include "zm_coord.h" #include "zm_coord.h"
#ifndef SOLARIS #ifndef SOLARIS

2
src/zm_buffer.h
View File

@ -20,7 +20,7 @@
#ifndef ZM_BUFFER_H #ifndef ZM_BUFFER_H
#define ZM_BUFFER_H #define ZM_BUFFER_H
#include "zm.h" #include "zm_logger.h"
#include <string.h> #include <string.h>

1
src/zm_comms.h
View File

@ -21,6 +21,7 @@
#define ZM_COMMS_H #define ZM_COMMS_H
#include "zm_exception.h" #include "zm_exception.h"
#include "zm_logger.h"
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

2
src/zm_coord.h
View File

@ -20,8 +20,6 @@
#ifndef ZM_COORD_H #ifndef ZM_COORD_H
#define ZM_COORD_H #define ZM_COORD_H
#include "zm.h"
// //
// Class used for storing an x,y pair, i.e. a coordinate // Class used for storing an x,y pair, i.e. a coordinate
// //

1
src/zm_event.h
View File

@ -34,7 +34,6 @@
#include <set> #include <set>
#include <map> #include <map>
#include "zm.h"
#include "zm_image.h" #include "zm_image.h"
#include "zm_stream.h" #include "zm_stream.h"

2
src/zm_exception.h
View File

@ -20,8 +20,6 @@
#ifndef ZM_EXCEPTION_H #ifndef ZM_EXCEPTION_H
#define ZM_EXCEPTION_H #define ZM_EXCEPTION_H
#include "zm.h"
#include <string> #include <string>
class Exception class Exception

2
src/zm_ffmpeg.h
View File

@ -20,7 +20,7 @@
#ifndef ZM_FFMPEG_H #ifndef ZM_FFMPEG_H
#define ZM_FFMPEG_H #define ZM_FFMPEG_H
#include <stdint.h> #include <stdint.h>
#include "zm.h"
#include "zm_image.h" #include "zm_image.h"
#ifdef __cplusplus #ifdef __cplusplus

2
src/zm_image.h
View File

@ -20,7 +20,6 @@
#ifndef ZM_IMAGE_H #ifndef ZM_IMAGE_H
#define ZM_IMAGE_H #define ZM_IMAGE_H
#include "zm.h"
extern "C" extern "C"
{ {
#include "zm_jpeg.h" #include "zm_jpeg.h"
@ -31,6 +30,7 @@ extern "C"
#include "zm_poly.h" #include "zm_poly.h"
#include "zm_mem_utils.h" #include "zm_mem_utils.h"
#include "zm_utils.h" #include "zm_utils.h"
#include "zm_logger.h"
#include <errno.h> #include <errno.h>

6
src/zm_image_analyser.h
View File

@ -1,8 +1,6 @@
#ifndef ZM_IMAGE_ANALYSER_H #ifndef ZM_IMAGE_ANALYSER_H
#define ZM_IMAGE_ANALYSER_H #define ZM_IMAGE_ANALYSER_H
#include <list> #include <list>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
@ -10,18 +8,14 @@
#include <memory> #include <memory>
#include <algorithm> #include <algorithm>
#include "zm.h"
#include "zm_detector.h" #include "zm_detector.h"
#include "zm_image.h" #include "zm_image.h"
#include "zm_zone.h" #include "zm_zone.h"
#include "zm_event.h" #include "zm_event.h"
#include "zm_db.h" #include "zm_db.h"
using namespace std; using namespace std;
//! List of available detectors. //! List of available detectors.
typedef std::list<Detector *> DetectorsList; typedef std::list<Detector *> DetectorsList;

1
src/zm_local_camera.h
View File

@ -20,7 +20,6 @@
#ifndef ZM_LOCAL_CAMERA_H #ifndef ZM_LOCAL_CAMERA_H
#define ZM_LOCAL_CAMERA_H #define ZM_LOCAL_CAMERA_H
#include "zm.h"
#include "zm_camera.h" #include "zm_camera.h"
#include "zm_image.h" #include "zm_image.h"

1
src/zm_mem_utils.h
View File

@ -21,7 +21,6 @@
#define ZM_MEM_UTILS_H #define ZM_MEM_UTILS_H
#include <stdlib.h> #include <stdlib.h>
#include "zm.h"
inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) { inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
uint8_t* retptr; uint8_t* retptr;

1
src/zm_monitor.h
View File

@ -23,7 +23,6 @@
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include "zm.h"
#include "zm_coord.h" #include "zm_coord.h"
#include "zm_image.h" #include "zm_image.h"
#include "zm_rgb.h" #include "zm_rgb.h"

1
src/zm_poly.h
View File

@ -20,7 +20,6 @@
#ifndef ZM_POLY_H #ifndef ZM_POLY_H
#define ZM_POLY_H #define ZM_POLY_H
#include "zm.h"
#include "zm_coord.h" #include "zm_coord.h"
#include "zm_box.h" #include "zm_box.h"

2
src/zm_regexp.h
View File

@ -17,8 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "zm.h"
#ifndef ZM_REGEXP_H #ifndef ZM_REGEXP_H
#define ZM_REGEXP_H #define ZM_REGEXP_H

2
src/zm_rgb.h
View File

@ -20,6 +20,8 @@
#ifndef ZM_RGB_H #ifndef ZM_RGB_H
#define ZM_RGB_H #define ZM_RGB_H
#include <stdint.h>
typedef uint32_t Rgb; // RGB colour type typedef uint32_t Rgb; // RGB colour type
#define WHITE 0xff #define WHITE 0xff

2
src/zm_rtp.h
View File

@ -20,8 +20,6 @@
#ifndef ZM_RTP_H #ifndef ZM_RTP_H
#define ZM_RTP_H #define ZM_RTP_H
#include "zm.h"
#define RTP_VERSION 2 #define RTP_VERSION 2
#endif // ZM_RTP_H #endif // ZM_RTP_H

1
src/zm_rtsp.h
View File

@ -20,7 +20,6 @@
#ifndef ZM_RTSP_H #ifndef ZM_RTSP_H
#define ZM_RTSP_H #define ZM_RTSP_H
#include "zm.h"
#include "zm_ffmpeg.h" #include "zm_ffmpeg.h"
#include "zm_comms.h" #include "zm_comms.h"
#include "zm_thread.h" #include "zm_thread.h"

2
src/zm_sdp.h
View File

@ -20,8 +20,6 @@
#ifndef ZM_SDP_H #ifndef ZM_SDP_H
#define ZM_SDP_H #define ZM_SDP_H
#include "zm.h"
#include "zm_utils.h" #include "zm_utils.h"
#include "zm_exception.h" #include "zm_exception.h"
#include "zm_ffmpeg.h" #include "zm_ffmpeg.h"

3
src/zm_signal.h
View File

@ -29,9 +29,6 @@
#include <ucontext.h> #include <ucontext.h>
#endif #endif
#include "zm.h"
typedef RETSIGTYPE (SigHandler)( int ); typedef RETSIGTYPE (SigHandler)( int );
extern bool zm_reload; extern bool zm_reload;

1
src/zm_stream.h
View File

@ -23,7 +23,6 @@
#include <sys/un.h> #include <sys/un.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "zm.h"
#include "zm_mpeg.h" #include "zm_mpeg.h"
class Monitor; class Monitor;

2
src/zm_thread.h
View File

@ -20,6 +20,8 @@
#ifndef ZM_THREAD_H #ifndef ZM_THREAD_H
#define ZM_THREAD_H #define ZM_THREAD_H
#include "zm_config.h"
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>

7
src/zm_time.h
View File

@ -20,7 +20,12 @@
#ifndef ZM_TIME_H #ifndef ZM_TIME_H
#define ZM_TIME_H #define ZM_TIME_H
#include "zm.h" #include "zm_config.h"
#include "zm_logger.h"
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#include <sys/time.h> #include <sys/time.h>

1
src/zm_user.h
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "zm.h"
#include "zm_db.h" #include "zm_db.h"
#ifndef ZM_USER_H #ifndef ZM_USER_H