Move qsrvsrc.srcpf dependency to xmlstoredp.srvpgm

Creating the service program depends on the QSRVSRC file existing,
while creating the modules themselves do not, so move the dependency
to where it belongs. Unfortunately, we cannot use the implicit variable
$^ for our list of modules anymore as it now contains the srcpf, so
move the module list to a variable we can refer to.

Author: kadler

Makefile.in

@@ -38,6 +38,8 @@ TEST_SRVPGMS=\
 	zzsrv.srvpgm \
 	zzsrv6.srvpgm
 
+XMLSTOREDP_MODULES=xmlstoredp.module $(COMMON)
+
 # Ensure that intermediate files created by rules chains don't get
 # automatically deleted
 .PRECIOUS: %.module %.srcpf %.lib
@@ -70,9 +72,9 @@ xmlver.pgm: xmlver.module
 xmlcgi.pgm: xmlcgi.module $(COMMON)
 	system -q "CRTPGM PGM($(LIBRARY)/$(@:%.pgm=%)) MODULE($(^:%.module=$(LIBRARY)/%)) BNDSRVPGM(QHTTPSVR/QZSRCORE)" && touch $@
 
-xmlstoredp.srvpgm: xmlstoredp.module $(COMMON)
+xmlstoredp.srvpgm: qsrvsrc.srcpf $(XMLSTOREDP_MODULES)
 	system -q "CPYFRMSTMF FROMSTMF('src/$(@:%.srvpgm=%).bnd') TOMBR('/qsys.lib/$(LIBRARY).lib/qsrvsrc.file/$(@:%.srvpgm=%).mbr') MBROPT(*REPLACE)"
-	system -q "CRTSRVPGM SRVPGM($(LIBRARY)/$(@:%.srvpgm=%)) MODULE($(^:%.module=$(LIBRARY)/%)) EXPORT(*SRCFILE) SRCFILE($(LIBRARY)/QSRVSRC) ACTGRP(*CALLER)" && touch $@
+	system -q "CRTSRVPGM SRVPGM($(LIBRARY)/$(@:%.srvpgm=%)) MODULE($(XMLSTOREDP_MODULES:%.module=$(LIBRARY)/%)) EXPORT(*SRCFILE) SRCFILE($(LIBRARY)/QSRVSRC) ACTGRP(*CALLER)" && touch $@
 
 %.pgm: src/%.clp qclsrc.srcpf
 	system -q "CPYFRMSTMF FROMSTMF('$<') TOMBR('/qsys.lib/$(LIBRARY).lib/qclsrc.file/$*.mbr') MBROPT(*REPLACE)"
@@ -88,14 +90,14 @@ xmlstoredp.srvpgm: xmlstoredp.module $(COMMON)
 %.sqlinst: src/%.sql
 	system -q "RUNSQLSTM SRCSTMF('$<')" && touch $@
 
-%.module: src/%.rpgle qsrvsrc.srcpf
+%.module: src/%.rpgle
 	system "CRTRPGMOD MODULE($(LIBRARY)/$*) SRCSTMF('$<') DBGVIEW($(DBGVIEW)) REPLACE(*YES) TGTCCSID(37)" > $*.log 2> $*.msg && rm $*.log $*.msg || touch $*.failed
 	test ! -e $*.msg || cat $*.msg
 	test ! -e $*.log || ./parse.sh $*.log
 	if [ -e $*.failed ]; then rm $*.failed; exit 1; fi
 	touch $@
 
-%.module: src/%.rpglesql qsrvsrc.srcpf
+%.module: src/%.rpglesql
 	system "CRTSQLRPGI OBJ($(LIBRARY)/$*) SRCSTMF('$<') OBJTYPE(*MODULE) REPLACE(*YES) RPGPPOPT(*LVL2) COMPILEOPT('INCDIR(''src/'') TGTCCSID(37)')" > $*.log 2> $*.msg && rm $*.log $*.msg || touch $*.failed
 	test ! -e $*.msg || cat $*.msg
 	test ! -e $*.log || ./parse.sh $*.log