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

Rename zoneminder library

This commit is contained in:
Emmanuel Papin 2015-05-30 14:11:42 +02:00
parent 33f7342cec
commit 872fead1fa
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -26,7 +26,7 @@ m4/*
misc/apache.conf misc/apache.conf
misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.policy
misc/com.zoneminder.systemctl.rules misc/com.zoneminder.systemctl.rules
misc/libzm.pc misc/libzoneminder.pc
misc/logrotate.conf misc/logrotate.conf
misc/syslog.conf misc/syslog.conf
misc/plugins.conf misc/plugins.conf

2
configure.ac
View File

@ -600,7 +600,7 @@ fi
AC_SUBST(PERL_MM_PARMS) AC_SUBST(PERL_MM_PARMS)
AC_SUBST(EXTRA_PERL_LIB) AC_SUBST(EXTRA_PERL_LIB)
AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/libzm.pc misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules misc/plugins.conf onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile]) AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/libzoneminder.pc misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules misc/plugins.conf onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
# Create the definitions for compilation and defaults for the database # Create the definitions for compilation and defaults for the database
AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl]) AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])

4
distros/debian/libzoneminder-dev.install
View File

@ -1,3 +1,3 @@
usr/include/zoneminder/* usr/include/zoneminder/*
usr/lib/*/libzm.a usr/lib/*/libzoneminder.a
usr/lib/*/pkgconfig/libzm.pc usr/lib/*/pkgconfig/libzoneminder.pc

4
distros/debian8/libzoneminder-dev.install
View File

@ -1,3 +1,3 @@
usr/include/zoneminder usr/include/zoneminder
usr/lib/*/libzm.a usr/lib/*/libzoneminder.a
usr/lib/*/pkgconfig/libzm.pc usr/lib/*/pkgconfig/libzoneminder.pc

2
misc/Makefile.am
View File

@ -15,7 +15,7 @@ EXTRA_DIST += plugins.conf.in
# Install a pkg-config file for a proper handling of the libzm # Install a pkg-config file for a proper handling of the libzm
# convenience library # convenience library
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libzm.pc pkgconfig_DATA = libzoneminder.pc
sysconf_DATA = plugins.conf sysconf_DATA = plugins.conf
endif endif

2
misc/libzm.pc.in → misc/libzoneminder.pc.in
View File

@ -12,6 +12,6 @@ Version: @PACKAGE_VERSION@
Requires: Requires:
Requires.private: Requires.private:
Conflicts: Conflicts:
Libs: -L${libdir} -lzmplugins @LIBS@ Libs: -L${libdir} -lzoneminder @LIBS@
Libs.private : Libs.private :
Cflags: -I${includedir}/@PACKAGE@ Cflags: -I${includedir}/@PACKAGE@

18
src/Makefile.am
View File

@ -56,7 +56,7 @@ zm_SOURCES = \
zm_user.cpp \ zm_user.cpp \
$(SOURCES_common) $(SOURCES_common)
# These source files are used both for zm binaries and the libzm # These source files are used both for zm binaries and the libzoneminder
# convenience library # convenience library
SOURCES_common = \ SOURCES_common = \
zm_config.cpp \ zm_config.cpp \
@ -69,7 +69,7 @@ SOURCES_common = \
zm_thread.cpp \ zm_thread.cpp \
zm_zone.cpp zm_zone.cpp
# These header files are used both for zm binaries and the libzm # These header files are used both for zm binaries and the libzoneminder
# convenience library # convenience library
HEADERS_common = \ HEADERS_common = \
jinclude.h \ jinclude.h \
@ -153,12 +153,12 @@ zm_SOURCES += \
zm_plugin_manager.cpp zm_plugin_manager.cpp
# Build a convenience library for plugin development # Build a convenience library for plugin development
noinst_LTLIBRARIES = libzm.la noinst_LTLIBRARIES = libzoneminder.la
libzm_la_SOURCES = zm_detector.cpp $(SOURCES_common) libzoneminder_la_SOURCES = zm_detector.cpp $(SOURCES_common)
# A hack to avoid conflicts between objects created both with libtool # A hack to avoid conflicts between objects created both with libtool
# and without (objects will be prefixed with "libzm_la") # and without (objects will be prefixed with "libzoneminder_la")
libzm_la_CPPFLAGS = $(AM_CPPFLAGS) libzoneminder_la_CPPFLAGS = $(AM_CPPFLAGS)
# Install the necessary headers for plugin development # Install the necessary headers for plugin development
pkginclude_HEADERS = \ pkginclude_HEADERS = \
@ -185,14 +185,14 @@ dist-hook:
@( rm $(distdir)/zm_config.h ) @( rm $(distdir)/zm_config.h )
# Yes, you are correct. This is a HACK! # Yes, you are correct. This is a HACK!
# And the manual installation of libzm.a is necessary because libtool has # And the manual installation of libzoneminder.a is necessary because libtool has
# no option to force installation of convenience libraries. # no option to force installation of convenience libraries.
install-exec-hook: install-exec-hook:
( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) ) ( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms ) ( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
install -D -m 644 .libs/libzm.a $(DESTDIR)$(libdir)/libzm.a install -D -m 644 .libs/libzoneminder.a $(DESTDIR)$(libdir)/libzoneminder.a
uninstall-hook: uninstall-hook:
( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms ) ( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )
( cd $(DESTDIR)$(libdir); rm -f libzm.a ) ( cd $(DESTDIR)$(libdir); rm -f libzoneminder.a )