Skip to content

Commit 1eafb65

Browse files
committed
Update gtkdocize
1 parent f0321d8 commit 1eafb65

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

gtk-doc.make

100755100644
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
5757
sgml.stamp html.stamp pdf.stamp
5858

5959
SCANOBJ_FILES = \
60+
$(DOC_MODULE).actions \
6061
$(DOC_MODULE).args \
6162
$(DOC_MODULE).hierarchy \
6263
$(DOC_MODULE).interfaces \
@@ -135,7 +136,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
135136
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
136137
$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
137138
scanobj_options=""; \
138-
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
139+
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\--verbose"; \
139140
if test "$$?" = "0"; then \
140141
if test "x$(V)" = "x1"; then \
141142
scanobj_options="--verbose"; \
@@ -197,13 +198,13 @@ GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references";
197198
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
198199
$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
199200
mkhtml_options=""; \
200-
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
201+
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--verbose"; \
201202
if test "$$?" = "0"; then \
202203
if test "x$(V)" = "x1"; then \
203204
mkhtml_options="$$mkhtml_options --verbose"; \
204205
fi; \
205206
fi; \
206-
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
207+
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\--path"; \
207208
if test "$$?" = "0"; then \
208209
mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
209210
fi; \
@@ -226,7 +227,7 @@ GTK_DOC_V_PDF_0=@echo " DOC Building PDF";
226227
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
227228
$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
228229
mkpdf_options=""; \
229-
gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
230+
gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\--verbose"; \
230231
if test "$$?" = "0"; then \
231232
if test "x$(V)" = "x1"; then \
232233
mkpdf_options="$$mkpdf_options --verbose"; \
@@ -235,7 +236,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
235236
if test "x$(HTML_IMAGES)" != "x"; then \
236237
for img in $(HTML_IMAGES); do \
237238
part=`dirname $$img`; \
238-
echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
239+
echo $$mkpdf_options | grep >/dev/null "\--imgdir=$$part "; \
239240
if test $$? != 0; then \
240241
mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
241242
fi; \
@@ -249,10 +250,10 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_cont
249250
clean-local:
250251
@rm -f *~ *.bak
251252
@rm -rf .libs
252-
@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
253+
@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-types" ; then \
253254
rm -f $(DOC_MODULE).types; \
254255
fi
255-
@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
256+
@if echo $(SCAN_OPTIONS) | grep -q "\--rebuild-sections" ; then \
256257
rm -f $(DOC_MODULE)-sections.txt; \
257258
fi
258259

m4/gtk-doc.m4

100755100644
File mode changed.

0 commit comments

Comments
 (0)