Renaming ntmake.pl to ntmake.PL (r1742) had unforseen side effects. At least

on freebsd ntmake.PL gets called automatically during build. This is not
desired. I renamed the file to ntmake-build sinc it gets called
explicilty on windows anyway. Reported by Kevin modified by Tobi

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1757 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/WIN32-BUILD-TIPS.txt b/WIN32-BUILD-TIPS.txt
index 67d2dd9..b3fae96 100644 (file)
--- a/WIN32-BUILD-TIPS.txt
+++ b/WIN32-BUILD-TIPS.txt
@@ -151,7 +151,7 @@ and cd to the bindings\perl-shared subdirectory.
 (8) Run vcvars32.bat; this batch file, in your vc98\bin directory will
 set necessary environment options for command line compiling.
 (9) In bindings\perl-shared, run
 (8) Run vcvars32.bat; this batch file, in your vc98\bin directory will
 set necessary environment options for command line compiling.
 (9) In bindings\perl-shared, run

-perl ntmake.pl
+perl ntmake-build

 nmake
 nmake test
 If nmake test succeeds, you are good to go. RRDs.dll is in 
 nmake
 nmake test
 If nmake test succeeds, you are good to go. RRDs.dll is in 

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 34ba5b8..4b5d6d4 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = $(SUB_tcl) $(SUB_lua)
 
 # the following files are not mentioned in any other Makefile
 EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
 
 # the following files are not mentioned in any other Makefile
 EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \

-            perl-shared/ntmake.PL perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm  perl-shared/RRDs.xs perl-shared/t/base.t \
+            perl-shared/ntmake-build perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm  perl-shared/RRDs.xs perl-shared/t/base.t \

             ruby/CHANGES     ruby/README      ruby/extconf.rb  ruby/main.c      ruby/test.rb \
              python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
 
             ruby/CHANGES     ruby/README      ruby/extconf.rb  ruby/main.c      ruby/test.rb \
              python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
 

diff --git a/bindings/perl-shared/MANIFEST b/bindings/perl-shared/MANIFEST
index 664d231..0f30b7e 100644 (file)
--- a/bindings/perl-shared/MANIFEST
+++ b/bindings/perl-shared/MANIFEST
@@ -1,4 +1,4 @@
-ntmake.pl
+ntmake-build

 MANIFEST
 README
 Makefile.PL
 MANIFEST
 README
 Makefile.PL

diff --git a/bindings/perl-shared/ntmake-build b/bindings/perl-shared/ntmake-build
new file mode 100644 (file)
index 0000000..047b76f
--- /dev/null
+++ b/bindings/perl-shared/ntmake-build
@@ -0,0 +1,27 @@
+use ExtUtils::MakeMaker;
+use Config;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+# Run VCVARS32.BAT before generating makefile/compiling.
+WriteMakefile(
+    'NAME'     => 'RRDs',
+    'VERSION_FROM' => 'RRDs.pm',
+#    'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+# keep compatible w/ ActiveState 5xx builds
+    'DEFINE'      => "-DPERLPATCHLEVEL=5",
+
+   'INC'       => '-I../../src/ "-I/Program Files/GnuWin32/include"',
+# Since we are now using GnuWin32 libraries dynamically (instead of static
+# complile with code redistributed with rrdtool), use /MD instead of /MT.
+# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
+# and it is available on most versions of Windows.
+   'OPTIMIZE' => '-O2 -MD',
+   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
+    'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
+    ($] ge '5.005') ? (
+        'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
+        'ABSTRACT' => 'Round Robin Database Tool',
+    ) : ()
+
+
+);

diff --git a/bindings/perl-shared/ntmake.PL b/bindings/perl-shared/ntmake.PL
deleted file mode 100644 (file)
index 047b76f..0000000
--- a/bindings/perl-shared/ntmake.PL
+++ /dev/null
@@ -1,27 +0,0 @@
-use ExtUtils::MakeMaker;
-use Config;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-# Run VCVARS32.BAT before generating makefile/compiling.
-WriteMakefile(
-    'NAME'     => 'RRDs',
-    'VERSION_FROM' => 'RRDs.pm',
-#    'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-# keep compatible w/ ActiveState 5xx builds
-    'DEFINE'      => "-DPERLPATCHLEVEL=5",
-
-   'INC'       => '-I../../src/ "-I/Program Files/GnuWin32/include"',
-# Since we are now using GnuWin32 libraries dynamically (instead of static
-# complile with code redistributed with rrdtool), use /MD instead of /MT.
-# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
-# and it is available on most versions of Windows.
-   'OPTIMIZE' => '-O2 -MD',
-   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
-    'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
-    ($] ge '5.005') ? (
-        'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
-        'ABSTRACT' => 'Round Robin Database Tool',
-    ) : ()
-
-
-);