From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 31 Jan 2009 13:39:04 +0000 (+0000)
Subject: Make lib/Config_heavy.pl part of $(CONFIGPM) as the build ordering is now sane.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=744ac0eac539aead596d9fa09cc15a20b09a5884;p=p5sagit%2Fp5-mst-13.2.git

Make lib/Config_heavy.pl part of $(CONFIGPM) as the build ordering is now sane.
Effectively $(CONFIGPM_EXTRA) becomes $(CONFIGPM) and $(CONFIGPM) becomes
$(CONFIGPM_FROM_CONFIG_SH). Mention lib/Config_heavy.pl as something that
is built by running make_patchnum.pl
Hopefully this avoids warnings from Config.pm during the build.
---

diff --git a/Makefile.SH b/Makefile.SH
index db70dfb..2e82a8e 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -367,10 +367,8 @@ CCCMD    = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
 
 CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<`
 
-# we dont include lib/Config_git.pl here, as it causes circular dependencies
-CONFIGPM = lib/Config.pm lib/Config_heavy.pl
-# so we add it here:
-CONFIGPM_EXTRA = $(CONFIGPM) lib/Config_git.pl
+CONFIGPM_FROM_CONFIG_SH = lib/Config.pm lib/Config_heavy.pl
+CONFIGPM = $(CONFIGPM_FROM_CONFIG_SH) lib/Config_git.pl
 
 CONFIGPOD = lib/Config.pod
 
@@ -529,7 +527,7 @@ all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) miniperl extra.pods $(private) $(unidat
 
 .PHONY: all translators utilities
 
-git_version.h: miniperl$(EXE_EXT) make_patchnum.pl
+lib/Config_git.pl git_version.h: miniperl$(EXE_EXT) make_patchnum.pl
 	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_patchnum.pl
 
 # make sure that we recompile perl.c if the git version changes
@@ -944,11 +942,9 @@ preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
 	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib -MAutoSplit -MFile::Find -e 'find ({no_chdir=>1, wanted => sub {autosplit_lib_modules($$_) if /\.pm$$/}}, "lib")'
 	$(MAKE) lib/re.pm
 
-$(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
+$(CONFIGPM_FROM_CONFIG_SH) $(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
 	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib configpm
 
-$(CONFIGPM): $(CONFIGPOD)
-
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)
 	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) minimod.pl > lib/ExtUtils/Miniperl.pm