fix various compilation issues

OSGeo · Jun 16, 2024 · e2fd51c · e2fd51c
1 parent d33bcb9
commit e2fd51c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/include/Make/GuiScript.make b/include/Make/GuiScript.make
@@ -31,14 +31,26 @@ $(HTMLDIR)/g.gui.%.html: g.gui.%.html g.gui.%.tmp.html | $(HTMLDIR)
 	VERSION_NUMBER=$(GRASS_VERSION_NUMBER) VERSION_DATE=$(GRASS_VERSION_DATE) MODULE_TOPDIR=$(MODULE_TOPDIR) \
         $(PYTHON) $(GISBASE)/utils/mkhtml.py g.gui.$* $(GRASS_VERSION_DATE) > $@
 
+$(MDDIR)/source/g.gui.%.md: g.gui.%.md g.gui.%.tmp.md | $(MDDIR)
+	VERSION_NUMBER=$(GRASS_VERSION_NUMBER) VERSION_DATE=$(GRASS_VERSION_DATE) MODULE_TOPDIR=$(MODULE_TOPDIR) \
+        $(PYTHON) $(GISBASE)/utils/mkmarkdown.py g.gui.$* $(GRASS_VERSION_DATE) > $@
+
 $(HTMLDIR)/wxGUI.%.html: g.gui.%.html | $(HTMLDIR)
 	-rm -f g.gui.$*.tmp.html
 	VERSION_NUMBER=$(GRASS_VERSION_NUMBER) VERSION_DATE=$(GRASS_VERSION_DATE) MODULE_TOPDIR=$(MODULE_TOPDIR) \
         $(PYTHON) $(GISBASE)/utils/mkhtml.py g.gui.$* $(GRASS_VERSION_DATE) > $@
 
+$(HTMLDIR)/source/wxGUI.%.md: g.gui.%.,d | $(HTMLDIR)
+	-rm -f g.gui.$*.tmp.md
+	VERSION_NUMBER=$(GRASS_VERSION_NUMBER) VERSION_DATE=$(GRASS_VERSION_DATE) MODULE_TOPDIR=$(MODULE_TOPDIR) \
+        $(PYTHON) $(GISBASE)/utils/mkmarkdown.py g.gui.$* $(GRASS_VERSION_DATE) > $@
+
 g.gui.%.tmp.html: $(SCRIPTDIR)/g.gui.%
 	$(call htmldesc,$<,$@)
 
+g.gui.%.tmp.md: $(SCRIPTDIR)/g.gui.%
+	$(call mddesc,$<,$@)
+
 $(SCRIPTDIR)/g.gui.%$(SCRIPTEXT): g.gui.%.py | $(SCRIPTDIR)
 	$(INSTALL) $< $@
 

diff --git a/include/Make/NoHtml.make b/include/Make/NoHtml.make
@@ -2,5 +2,9 @@
 $(HTMLDIR)/$(PGM).html:
 	@echo no HTML documentation available
 
+# TODO: move ?
+$(MDDIR)/source/$(PGM).md:
+	@echo no Markdown documentation available
+
 $(MANDIR)/$(PGM).$(MANSECT):
 	@echo no manual page available
diff --git a/utils/Makefile b/utils/Makefile
@@ -5,10 +5,13 @@ SUBDIRS = timer g.html2man
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 include $(MODULE_TOPDIR)/include/Make/Compile.make
 
-default: parsubdirs $(UTILSDIR)/mkmarkdown.py \
+default: parsubdirs $(UTILSDIR)/mkhtml.py $(UTILSDIR)/mkmarkdown.py \
 	$(UTILSDIR)/generate_last_commit_file.py \
 	$(UTILSDIR)/g.echo$(EXE)
 
+$(UTILSDIR)/mkhtml.py: mkhtml.py
+	$(INSTALL) $< $@
+
 $(UTILSDIR)/mkmarkdown.py: mkmarkdown.py
 	$(INSTALL) $< $@