diff --git a/modules/ca/src/perl/Makefile b/modules/ca/src/perl/Makefile index 65f42ee3a..12e0c82b5 100644 --- a/modules/ca/src/perl/Makefile +++ b/modules/ca/src/perl/Makefile @@ -42,8 +42,6 @@ ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32 PERL_MODULES += CA.pm PERL_MODULES += $(PERL_ARCHPATH)/$(LOADABLE_SHRLIB_PREFIX)Cap5$(LOADABLE_SHRLIB_SUFFIX) - PERL_SCRIPTS += caModuleDirs.pm - HTMLS_DIR = . HTMLS = CA.html endif diff --git a/modules/ca/src/perl/capr.pl b/modules/ca/src/perl/capr.pl index e551afcef..ba5998a14 100644 --- a/modules/ca/src/perl/capr.pl +++ b/modules/ca/src/perl/capr.pl @@ -11,7 +11,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use caModuleDirs; no lib $Bin; use Getopt::Std; diff --git a/modules/database/src/tools/Makefile b/modules/database/src/tools/Makefile index bfd329fbe..f54ab9c07 100644 --- a/modules/database/src/tools/Makefile +++ b/modules/database/src/tools/Makefile @@ -27,8 +27,6 @@ PERL_MODULES += DBD/Variable.pm PERL_MODULES += EPICS/IOC.pm HTMLS += EPICS/IOC.html -PERL_SCRIPTS += databaseModuleDirs.pm - PERL_SCRIPTS += makeIncludeDbd.pl PERL_SCRIPTS += dbdToMenuH.pl diff --git a/modules/database/src/tools/dbExpand.pl b/modules/database/src/tools/dbExpand.pl index 25cab26cc..35d7750d9 100644 --- a/modules/database/src/tools/dbExpand.pl +++ b/modules/database/src/tools/dbExpand.pl @@ -13,7 +13,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdExpand.pl b/modules/database/src/tools/dbdExpand.pl index a87ef47bb..5f12dc23e 100644 --- a/modules/database/src/tools/dbdExpand.pl +++ b/modules/database/src/tools/dbdExpand.pl @@ -11,7 +11,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdReport.pl b/modules/database/src/tools/dbdReport.pl index 0d4c85494..adc268345 100644 --- a/modules/database/src/tools/dbdReport.pl +++ b/modules/database/src/tools/dbdReport.pl @@ -9,7 +9,6 @@ use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdToHtml.pl b/modules/database/src/tools/dbdToHtml.pl index e9711f757..fa1cc99d7 100644 --- a/modules/database/src/tools/dbdToHtml.pl +++ b/modules/database/src/tools/dbdToHtml.pl @@ -11,7 +11,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use DBD; diff --git a/modules/database/src/tools/dbdToMenuH.pl b/modules/database/src/tools/dbdToMenuH.pl index ac4345b42..30418a351 100644 --- a/modules/database/src/tools/dbdToMenuH.pl +++ b/modules/database/src/tools/dbdToMenuH.pl @@ -9,7 +9,6 @@ use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use EPICS::Getopts; diff --git a/modules/database/src/tools/dbdToRecordtypeH.pl b/modules/database/src/tools/dbdToRecordtypeH.pl index b1eb77d93..f1336a147 100644 --- a/modules/database/src/tools/dbdToRecordtypeH.pl +++ b/modules/database/src/tools/dbdToRecordtypeH.pl @@ -9,7 +9,6 @@ use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use EPICS::Getopts; diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl index 02bb9b772..671d24051 100644 --- a/modules/database/src/tools/registerRecordDeviceDriver.pl +++ b/modules/database/src/tools/registerRecordDeviceDriver.pl @@ -13,7 +13,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use databaseModuleDirs; no lib $Bin; use DBD; diff --git a/modules/libcom/src/env/Makefile b/modules/libcom/src/env/Makefile index 804426bc0..94322a228 100644 --- a/modules/libcom/src/env/Makefile +++ b/modules/libcom/src/env/Makefile @@ -12,7 +12,6 @@ SRC_DIRS += $(LIBCOM)/env vpath %.pl $(USR_VPATH) $(SRC_DIRS) PERL_SCRIPTS += bldEnvData.pl -PERL_SCRIPTS += libcomModuleDirs.pm INC += envDefs.h diff --git a/modules/libcom/src/env/RULES b/modules/libcom/src/env/RULES index 02df6aa7a..5ef766d57 100644 --- a/modules/libcom/src/env/RULES +++ b/modules/libcom/src/env/RULES @@ -8,7 +8,7 @@ # This is a Makefile fragment, see src/libCom/Makefile. envData.c: $(LIBCOM)/env/envDefs.h \ - $(INSTALL_HOST_BIN)/bldEnvData.pl $(INSTALL_HOST_BIN)/libcomModuleDirs.pm \ + $(INSTALL_HOST_BIN)/bldEnvData.pl \ $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV \ $(wildcard $(CONFIG)/os/CONFIG_SITE_ENV.$(T_A)) $(PERL) $(INSTALL_HOST_BIN)/bldEnvData.pl $(QUIET_FLAG) -t $(T_A) \ diff --git a/modules/libcom/src/env/bldEnvData.pl b/modules/libcom/src/env/bldEnvData.pl index e3c21b772..f638c841f 100644 --- a/modules/libcom/src/env/bldEnvData.pl +++ b/modules/libcom/src/env/bldEnvData.pl @@ -15,7 +15,6 @@ use strict; use FindBin qw($Bin); use lib ($Bin, "$Bin/../../lib/perl"); -use libcomModuleDirs; no lib $Bin; use Getopt::Std;