Merge pull request #197 from IBM/fix/eventf_names

Fix/eventf names
IBM · Feb 9, 2023 · d56f561 · d56f561
2 parents 3ef051d + dafbda4
commit d56f561
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/mk/def_rules.mk b/src/mk/def_rules.mk
@@ -361,6 +361,8 @@ cleanRPGDeps = awk '$$1 == "FILEID" && $$6 !~ /^QTEMP/ && toupper($$6) !~ /QSYS/
 # if any externally-described files are declared.  If so, isolate the actual source file name from its path,
 # convert everything to upper case, format in makefile dependency format, and output all these dependencies
 # to a file that will be included by Make.
+# - The above is not being done at this time
+#  parm is name of local evfevent file (might have .PGM.eventf suffix)
 define EVFEVENT_DOWNLOAD =
 system "CPYTOSTMF FROMMBR('$(OBJPATH)/EVFEVENT.FILE/$(basename $@).MBR') TOSTMF('$(EVTDIR)/$1') STMFCCSID(1208) ENDLINFMT(*LF) CVTDTA(*AUTO) STMFOPT(*REPLACE)" >/dev/null
 endef
@@ -899,7 +901,7 @@ define SQLRPGLE_TO_MODULE_RECIPE =
 	$(eval crtcmd := crtsqlrpgi obj($(OBJLIB)/$(basename $(@F))) srcstmf('$<') $(CRTSQLRPGIFLAGS))
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/launch "$(JOBLOGFILE)" "$(crtcmd)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$(basename $(@F)).evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$(notdir $<).evfevent)
 endef
 
 #   ____   ____ __  __   ____           _                 
@@ -952,7 +954,7 @@ define PGM.RPGLE_TO_PGM_RECIPE =
 	$(eval crtcmd := CRTBNDRPG srcstmf('$<') PGM($(OBJLIB)/$(basename $(@F))) $(CRTBNDRPGFLAGS))
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/launch "$(JOBLOGFILE)" "$(crtcmd)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$*.PGM.RPGLE.evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$(basename $($@)).PGM.evfevent)
 endef
 
 define PGM.SQLRPGLE_TO_PGM_RECIPE =
@@ -962,7 +964,7 @@ define PGM.SQLRPGLE_TO_PGM_RECIPE =
 	$(eval crtcmd := CRTSQLRPGI srcstmf('$<') OBJ($(OBJLIB)/$(basename $(@F))) $(CRTSQLRPGIFLAGS))
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/launch "$(JOBLOGFILE)" "$(crtcmd)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$*.PGM.SQLRPGLE.evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$(basename $@).PGM.evfevent)
 endef
 
 define PGM.C_TO_PGM_RECIPE =
@@ -972,7 +974,7 @@ define PGM.C_TO_PGM_RECIPE =
 	$(eval crtcmd := CRTBNDC srcstmf('$<') PGM($(OBJLIB)/$(basename $(@F))) $(CRTBNDCFLAGS))
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/launch "$(JOBLOGFILE)" "$(crtcmd)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$*.PGM.C.evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$(basename $(@F)).PGM.evfevent)
 endef
 
 define CBL_TO_PGM_RECIPE =
@@ -1022,7 +1024,7 @@ define MODULE_TO_PGM_RECIPE =
 	$(eval crtcmd := crtpgm pgm($(OBJLIB)/$(basename $(@F))) module($(basename $(filter %.MODULE,$(notdir $^)))) bndsrvpgm($(if $(BNDSRVPGMPATH),$(BNDSRVPGMPATH),*NONE)) $(CRTPGMFLAGS))
 	@$(PRESETUP) \
 	$(SCRIPTSPATH)/launch "$(JOBLOGFILE)" "$(crtcmd)" >> $(LOGFILE) 2>&1 && $(call logSuccess,$@) || $(call logFail,$@)
-	@$(call EVFEVENT_DOWNLOAD,$*.PGM.evfevent)
+	@$(call EVFEVENT_DOWNLOAD,$(tgt).PGM.evfevent)
 endef
 
 #   ____  _   _ _     ____ ____  ____    ____           _