Move soexpand.pl into build-aux and make it non-executable.

Scripts for the build generally go in build-aux, so move soexpand.pl.
soexpand.pl had the "executable" bit set, but it doesn't have a #! line
and it's not a shell script, so that didn't make sense.

diff --git a/Makefile.am b/Makefile.am
index 3cd56de..0e2c6d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ EXTRA_DIST = \
        SubmittingPatches \
        WHY-OVS \
        boot.sh \
+       build-aux/soexpand.pl \
        $(MAN_FRAGMENTS)
 bin_PROGRAMS =
 sbin_PROGRAMS =
@@ -81,15 +82,12 @@ scriptsdir = $(pkgdatadir)/scripts
 # http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
 noinst_HEADERS += $(EXTRA_DIST)
 
-EXTRA_DIST += \
-       soexpand.pl
-
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
 ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n'
 
 SUFFIXES += .in
 .in:
-       $(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \
+       $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
            sed \
                -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \

diff --git a/build-aux/soexpand.pl b/build-aux/soexpand.pl
new file mode 100644 (file)
index 0000000..924295c
--- /dev/null
+++ b/build-aux/soexpand.pl
@@ -0,0 +1,40 @@
+# Copyright (c) 2008 Nicira Networks.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+use strict;
+use warnings;
+use Getopt::Long;
+
+my ($exit_code) = 0;
+my (@include_dirs);
+Getopt::Long::Configure ("bundling");
+GetOptions("I|include=s" => \@include_dirs) or exit(1);
+@include_dirs = ('.') if !@include_dirs;
+OUTER: while (<STDIN>) {
+    if (my ($name) = /^\.so (\S+)$/) {
+       foreach my $dir (@include_dirs, '.') {
+           if (open(INNER, "$dir/$name")) {
+               while (<INNER>) {
+                   print $_;
+               }
+               close(INNER);
+               next OUTER;
+           }
+       }
+       print STDERR "$name not found in: ", join(' ', @include_dirs), "\n";
+       $exit_code = 1;
+    }
+    print $_;
+}
+exit $exit_code;

diff --git a/soexpand.pl b/soexpand.pl
deleted file mode 100755 (executable)
index 924295c..0000000
--- a/soexpand.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2008 Nicira Networks.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-use Getopt::Long;
-
-my ($exit_code) = 0;
-my (@include_dirs);
-Getopt::Long::Configure ("bundling");
-GetOptions("I|include=s" => \@include_dirs) or exit(1);
-@include_dirs = ('.') if !@include_dirs;
-OUTER: while (<STDIN>) {
-    if (my ($name) = /^\.so (\S+)$/) {
-       foreach my $dir (@include_dirs, '.') {
-           if (open(INNER, "$dir/$name")) {
-               while (<INNER>) {
-                   print $_;
-               }
-               close(INNER);
-               next OUTER;
-           }
-       }
-       print STDERR "$name not found in: ", join(' ', @include_dirs), "\n";
-       $exit_code = 1;
-    }
-    print $_;
-}
-exit $exit_code;