diff --git a/win32/GNUmakefile b/win32/GNUmakefile old mode 100644 new mode 100755 index 631366c..6847734 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -232,10 +232,11 @@ DEFAULT_INC_EXCLUDES_DOT := define # # in addition to BUILD_STATIC the option ALL_STATIC makes *every* -# extension get statically built +# extension get statically built. # This will result in a very large perl executable, but the main purpose # is to have proper linking set so as to be able to create miscellaneous -# executables with different built-in extensions +# executables with different built-in extensions. +# Using ALL_STATIC automatically turns on BUILD_STATIC. # #ALL_STATIC := define @@ -875,14 +876,11 @@ STATICDIR = .\static.tmp GLOBEXE = ..\perlglob.exe CONFIGPM = ..\lib\Config.pm GENUUDMAP = ..\generate_uudmap.exe -ifeq ($(BUILD_STATIC),define) -PERLSTATIC = static -else ifeq ($(ALL_STATIC),define) -PERLSTATIC = static -else -PERLSTATIC = +BUILD_STATIC = define endif +ifeq ($(BUILD_STATIC),define) +PERLSTATIC = static endif # Unicode data files generated by mktables @@ -1610,7 +1608,7 @@ PostExt : ..\lib\Storable\Limit.pm # be running in parallel like UNIDATAFILES, this target a placeholder for the # future ifeq ($(BUILD_STATIC),define) -rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) $(PERLEXESTATIC) +rebasePE : Extensions_normalize Extensions $(PERLDLL) $(PERLEXE) $(PERLEXESTATIC) else rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) endifThread Next