From 0eac723409e482731d83e52330109ea7dc9bfb2d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 1 Jan 2014 12:17:13 -0600 Subject: [PATCH] glob ptz scripts under control folder --- scripts/Makefile.am | 13 +----------- scripts/ZoneMinder/INSTALL.SKIP | 1 + scripts/ZoneMinder/MANIFEST.SKIP | 1 + scripts/ZoneMinder/Makefile.PL | 36 +------------------------------- 4 files changed, 4 insertions(+), 47 deletions(-) create mode 100644 scripts/ZoneMinder/INSTALL.SKIP create mode 100644 scripts/ZoneMinder/MANIFEST.SKIP diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 613278498..8f051f10b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,18 +53,7 @@ EXTRA_DIST = \ ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm \ ZoneMinder/lib/ZoneMinder/ConfigData.pm.in \ ZoneMinder/lib/ZoneMinder/Control.pm \ - ZoneMinder/lib/ZoneMinder/Control/PelcoD.pm \ - ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm \ - ZoneMinder/lib/ZoneMinder/Control/PanasonicIP.pm \ - ZoneMinder/lib/ZoneMinder/Control/Visca.pm \ - ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm \ - ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm \ - ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm \ - ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm \ - ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm \ - ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm \ - ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm \ - ZoneMinder/lib/ZoneMinder/Control/LoftekSentinel.pm \ + ZoneMinder/lib/ZoneMinder/Control \ # Grab all ptz control skips under the Control folder ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \ ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \ ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \ diff --git a/scripts/ZoneMinder/INSTALL.SKIP b/scripts/ZoneMinder/INSTALL.SKIP new file mode 100644 index 000000000..6ff6dd3c0 --- /dev/null +++ b/scripts/ZoneMinder/INSTALL.SKIP @@ -0,0 +1 @@ +\.pm\.in$ diff --git a/scripts/ZoneMinder/MANIFEST.SKIP b/scripts/ZoneMinder/MANIFEST.SKIP new file mode 100644 index 000000000..6ff6dd3c0 --- /dev/null +++ b/scripts/ZoneMinder/MANIFEST.SKIP @@ -0,0 +1 @@ +\.pm\.in$ diff --git a/scripts/ZoneMinder/Makefile.PL b/scripts/ZoneMinder/Makefile.PL index ad9d9e12e..51ba1a5a7 100644 --- a/scripts/ZoneMinder/Makefile.PL +++ b/scripts/ZoneMinder/Makefile.PL @@ -6,41 +6,7 @@ WriteMakefile( NAME => 'ZoneMinder', VERSION_FROM => 'lib/ZoneMinder/Base.pm', # finds $VERSION PREREQ_PM => {}, # e.g., Module::Name => 1.1 - PM => { - 'lib/ZoneMinder.pm' => '$(INST_LIBDIR)/ZoneMinder.pm', - 'lib/ZoneMinder/Base.pm' => '$(INST_LIBDIR)/ZoneMinder/Base.pm', - 'lib/ZoneMinder/Config.pm' => '$(INST_LIBDIR)/ZoneMinder/Config.pm', - 'lib/ZoneMinder/General.pm' => '$(INST_LIBDIR)/ZoneMinder/General.pm', - 'lib/ZoneMinder/Database.pm' => '$(INST_LIBDIR)/ZoneMinder/Database.pm', - 'lib/ZoneMinder/Logger.pm' => '$(INST_LIBDIR)/ZoneMinder/Logger.pm', - 'lib/ZoneMinder/Memory.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory.pm', - 'lib/ZoneMinder/Memory/Shared.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory/Shared.pm', - 'lib/ZoneMinder/Memory/Mapped.pm' => '$(INST_LIBDIR)/ZoneMinder/Memory/Mapped.pm', - 'lib/ZoneMinder/ConfigAdmin.pm' => '$(INST_LIBDIR)/ZoneMinder/ConfigAdmin.pm', - 'lib/ZoneMinder/ConfigData.pm' => '$(INST_LIBDIR)/ZoneMinder/ConfigData.pm', - 'lib/ZoneMinder/Control.pm' => '$(INST_LIBDIR)/ZoneMinder/Control.pm', - 'lib/ZoneMinder/Control/PelcoD.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/PelcoD.pm', - 'lib/ZoneMinder/Control/AxisV2.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/AxisV2.pm', - 'lib/ZoneMinder/Control/PanasonicIP.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/PanasonicIP.pm', - 'lib/ZoneMinder/Control/Visca.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Visca.pm', - 'lib/ZoneMinder/Control/Ncs370.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Ncs370.pm', - 'lib/ZoneMinder/Control/mjpgStreamer.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/mjpgStreamer.pm', - 'lib/ZoneMinder/Control/SkyIPCam7xx.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/SkyIPCam7xx.pm', - 'lib/ZoneMinder/Control/FI8608W_Y2k.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/FI8608W_Y2k.pm', - 'lib/ZoneMinder/Control/FI8620_Y2k.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/FI8620_Y2k.pm', - 'lib/ZoneMinder/Control/FI8908W.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/FI8908W.pm', - 'lib/ZoneMinder/Control/FI9821W_Y2k.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/FI9821W_Y2k.pm', - 'lib/ZoneMinder/Control/LoftekSentinel.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/LoftekSentinel.pm', - 'lib/ZoneMinder/Trigger/Channel.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel.pm', - 'lib/ZoneMinder/Trigger/Channel/Handle.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Handle.pm', - 'lib/ZoneMinder/Trigger/Channel/Spawning.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Spawning.pm', - 'lib/ZoneMinder/Trigger/Channel/Inet.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Inet.pm', - 'lib/ZoneMinder/Trigger/Channel/Unix.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Unix.pm', - 'lib/ZoneMinder/Trigger/Channel/File.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/File.pm', - 'lib/ZoneMinder/Trigger/Channel/Serial.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Serial.pm', - 'lib/ZoneMinder/Trigger/Connection.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Connection.pm', - 'lib/ZoneMinder/Trigger/Connection/Example.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Connection/Example.pm', - }, +# No need to specify perl modules. MakeMaker will find them automatically ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/ZoneMinder.pm', # retrieve abstract from module AUTHOR => 'Philip Coombes ') : ()),