From 872fead1fa25950473c308ed13a94ad83d5ed972 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 30 May 2015 14:11:42 +0200 Subject: [PATCH] Rename zoneminder library --- .gitignore | 2 +- configure.ac | 2 +- distros/debian/libzoneminder-dev.install | 4 ++-- distros/debian8/libzoneminder-dev.install | 4 ++-- misc/Makefile.am | 2 +- misc/{libzm.pc.in => libzoneminder.pc.in} | 2 +- src/Makefile.am | 18 +++++++++--------- 7 files changed, 17 insertions(+), 17 deletions(-) rename misc/{libzm.pc.in => libzoneminder.pc.in} (91%) diff --git a/.gitignore b/.gitignore index a79d23169..992da35d9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ m4/* misc/apache.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules -misc/libzm.pc +misc/libzoneminder.pc misc/logrotate.conf misc/syslog.conf misc/plugins.conf diff --git a/configure.ac b/configure.ac index 513cafedf..39fe4f8fa 100644 --- a/configure.ac +++ b/configure.ac @@ -600,7 +600,7 @@ fi AC_SUBST(PERL_MM_PARMS) 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 AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl]) diff --git a/distros/debian/libzoneminder-dev.install b/distros/debian/libzoneminder-dev.install index 229d6aa7d..38b4c4434 100644 --- a/distros/debian/libzoneminder-dev.install +++ b/distros/debian/libzoneminder-dev.install @@ -1,3 +1,3 @@ usr/include/zoneminder/* -usr/lib/*/libzm.a -usr/lib/*/pkgconfig/libzm.pc +usr/lib/*/libzoneminder.a +usr/lib/*/pkgconfig/libzoneminder.pc diff --git a/distros/debian8/libzoneminder-dev.install b/distros/debian8/libzoneminder-dev.install index 451b480db..092dafac0 100644 --- a/distros/debian8/libzoneminder-dev.install +++ b/distros/debian8/libzoneminder-dev.install @@ -1,3 +1,3 @@ usr/include/zoneminder -usr/lib/*/libzm.a -usr/lib/*/pkgconfig/libzm.pc +usr/lib/*/libzoneminder.a +usr/lib/*/pkgconfig/libzoneminder.pc diff --git a/misc/Makefile.am b/misc/Makefile.am index a3bb9338a..22f7b9002 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST += plugins.conf.in # Install a pkg-config file for a proper handling of the libzm # convenience library pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libzm.pc +pkgconfig_DATA = libzoneminder.pc sysconf_DATA = plugins.conf endif diff --git a/misc/libzm.pc.in b/misc/libzoneminder.pc.in similarity index 91% rename from misc/libzm.pc.in rename to misc/libzoneminder.pc.in index 46336af14..770d040f7 100644 --- a/misc/libzm.pc.in +++ b/misc/libzoneminder.pc.in @@ -12,6 +12,6 @@ Version: @PACKAGE_VERSION@ Requires: Requires.private: Conflicts: -Libs: -L${libdir} -lzmplugins @LIBS@ +Libs: -L${libdir} -lzoneminder @LIBS@ Libs.private : Cflags: -I${includedir}/@PACKAGE@ diff --git a/src/Makefile.am b/src/Makefile.am index 1df927487..41653ceae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,7 @@ zm_SOURCES = \ zm_user.cpp \ $(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 SOURCES_common = \ zm_config.cpp \ @@ -69,7 +69,7 @@ SOURCES_common = \ zm_thread.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 HEADERS_common = \ jinclude.h \ @@ -153,12 +153,12 @@ zm_SOURCES += \ zm_plugin_manager.cpp # Build a convenience library for plugin development -noinst_LTLIBRARIES = libzm.la -libzm_la_SOURCES = zm_detector.cpp $(SOURCES_common) +noinst_LTLIBRARIES = libzoneminder.la +libzoneminder_la_SOURCES = zm_detector.cpp $(SOURCES_common) # A hack to avoid conflicts between objects created both with libtool -# and without (objects will be prefixed with "libzm_la") -libzm_la_CPPFLAGS = $(AM_CPPFLAGS) +# and without (objects will be prefixed with "libzoneminder_la") +libzoneminder_la_CPPFLAGS = $(AM_CPPFLAGS) # Install the necessary headers for plugin development pkginclude_HEADERS = \ @@ -185,14 +185,14 @@ dist-hook: @( rm $(distdir)/zm_config.h ) # 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. install-exec-hook: ( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) ) ( 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: ( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms ) - ( cd $(DESTDIR)$(libdir); rm -f libzm.a ) + ( cd $(DESTDIR)$(libdir); rm -f libzoneminder.a )