diff --git a/FCLT.NMK b/FCLT.NMK index d2106211..01808be2 100644 --- a/FCLT.NMK +++ b/FCLT.NMK @@ -63,14 +63,12 @@ PROJEXE=z:\Project\FACILITOR\BUILD CURRENTVERSION=47 NEXTVERSION=48 FILEVERSION= -NEXTCAREVERSION=37 NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION) CURRENTUPDATE=DB$(CURRENTVERSION)to$(NEXTVERSION) UPROOT=$(PROJSRC)\_UP SRCUPDATE=$(UPROOT)\$(CURRENTUPDATE) SRCRECREA=$(UPROOT)\recreate -CARERECREA=$(UPROOT)\recare ## ## PATH DEFINES ## @@ -100,11 +98,9 @@ CLEANUP1=$(MAKTOOLS)\sedclean.bat ## ## RESULTS ## -all: $(EXE)\$(NEXTROOT)\$(CURRENTUPDATE)$(FILEVERSION).SQL \ +all: $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL \ $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL \ - $(EXE)\CARE\CARE$(NEXTCAREVERSION).SQL \ - $(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL \ - $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL + $(EXE)\$(NEXTROOT)\$(CURRENTUPDATE)$(FILEVERSION).SQL ## ## DEPENDENCIES AND ACTIONS @@ -328,38 +324,4 @@ $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL: \ $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\RECRE$(NEXTVERSION)$(FILEVERSION).SQL -########################################################################## -#### -#### FACILITOR CARE-WEBB EXTENSION -#### -########################################################################## -$(EXE)\CARE\CARE$(NEXTCAREVERSION).SQL: \ - $(MAK)\fclt.nmk \ - $(MSRC)\modules.h \ - $(MSRC)\care.src \ - $(MSRC)\care\care_tab.src \ - $(MSRC)\care\care_ind.src \ - $(MSRC)\care\care_vie.src \ - $(MSRC)\care\care_pac.src \ - $(MSRC)\care\care_ini.src - @IF NOT EXIST $(EXE)\CARE\NUL mkdir $(EXE)\CARE - $(PRECOMP) $(PRECOMP_OPTIONS) $(MSRC)\care.src>$(TEMP)\$(*B)_.sql - $(CLEANUP1) $(TEMP)\$(*B)_.sql - COPY $(TEMP)\$(*B)_.sql $(EXE)\CARE\CARE$(NEXTCAREVERSION)_.SQL - $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql - COPY $(TEMP)\$(*B).sql $(EXE)\CARE\CARE$(NEXTCAREVERSION).SQL - -$(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL: \ - $(CARERECREA).src \ - $(MAK)\fclt.nmk \ - $(MSRC)\care.src \ - $(MSRC)\comsql.h \ - $(EXE)\CARE\CARE$(NEXTCAREVERSION).sql - @IF NOT EXIST $(EXE)\CARE\NUL mkdir $(EXE)\CARE - $(PRECOMP) $(PRECOMP_OPTIONS) $(CARERECREA).src>$(TEMP)\$(*B)_.sql - $(CLEANUP1) $(TEMP)\$(*B)_.sql - COPY $(TEMP)\$(*B)_.sql $(EXE)\CARE\RECAR$(NEXTCAREVERSION)_.SQL - $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql - COPY $(TEMP)\$(*B).sql $(EXE)\CARE\RECAR$(NEXTCAREVERSION).SQL - ## END-OF-FILE