Complete reordering of directories

Move SymbolFile.pm and Objdump.pm into the Shlibs directory
Adapt Makefile.am
Fix a remaining reference to scripts/modules in configure.ac

diff --git a/configure.ac b/configure.ac
index 1b899efe280069c038728e114aa24418e2e921d1..2ea178a12fe67d94a257c5ef1416b04a181ceb3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ AC_CONFIG_FILES([ Makefile
                  origins/Makefile
                  po/Makefile.in
                  scripts/Makefile
-                 scripts/modules/Makefile
+                 scripts/Dpkg/Makefile
                  scripts/po/Makefile.in
                  src/Makefile
                  utils/Makefile ])

diff --git a/scripts/Dpkg/Makefile.am b/scripts/Dpkg/Makefile.am
index 0b6f25fc58b8775324a60347b741e664279d64bf..c83ba250b40c9a640918e607a93f6119c3550c0c 100644 (file)
--- a/scripts/Dpkg/Makefile.am
+++ b/scripts/Dpkg/Makefile.am
@@ -2,6 +2,6 @@
 shlibsmodulesdir=$(pkglibdir)/Dpkg/Shlibs
 dpkgmodulesdir=$(pkglibdir)/Dpkg
 
-dist_shlibsmodules_DATA = Objdump.pm SymbolFile.pm
+dist_shlibsmodules_DATA = Shlibs/Objdump.pm Shlibs/SymbolFile.pm
 dist_dpkgmodules_DATA = Shlibs.pm Version.pm
 

diff --git a/scripts/Dpkg/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
similarity index 100%
rename from scripts/Dpkg/Objdump.pm
rename to scripts/Dpkg/Shlibs/Objdump.pm

diff --git a/scripts/Dpkg/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
similarity index 100%
rename from scripts/Dpkg/SymbolFile.pm
rename to scripts/Dpkg/Shlibs/SymbolFile.pm