Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix silent doxygen rule #1047

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Fix silent doxygen rule #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f12b5
bs: Use "if ! cond; then" instead of "if cond; then :; else"
ndim Oct 23, 2024
cfed7e4
bs: fix silent rule invoking doxygen
ndim Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion camlibs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ all-mkf-camlibs: Makefile

.PHONY: all-local
all-local: all-cfg-camlibs all-mkf-camlibs
@if $(CMP) all-cfg-camlibs all-mkf-camlibs > /dev/null 2>&1; then :; else \
@if ! $(CMP) all-cfg-camlibs all-mkf-camlibs > /dev/null 2>&1; then \
echo "#"; \
for camlib in $$($(COMM) -23 all-cfg-camlibs all-mkf-camlibs); do \
echo "# - '$${camlib}' camlib in 'configure.ac', but not in Makefiles."; \
Expand Down
17 changes: 13 additions & 4 deletions doc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,19 @@ LOCAL_CLEAN =


# FIXME: Depend on source files.
DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp
$(HTML_APIDOC_DIR).stamp: Doxyfile
$(AM_V_GEN)doxygen Doxyfile
@: > $@
DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).log
$(HTML_APIDOC_DIR).log: Doxyfile
@if $(AM_V_P); then \
echo "doxygen $<"; \
doxygen $<; \
else \
printf " %-8s %s\n" DOXYGEN "$<"; \
if ! doxygen $< > $@ 2>&1; then \
cat $@; \
rm -f $@; \
exit 1; \
fi; \
fi

$(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp
(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
Expand Down
2 changes: 1 addition & 1 deletion libgphoto2_port/gphoto-m4/gp-set.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ AC_DEFUN_ONCE([_GP_SET_CHECK_INIT], [dnl
AC_REQUIRE([_GP_SET_INIT])dnl
gp_set_shfn_check ()
{
if test -f "[$]1"; then :; else
if ! test -f "[$]1"; then
AC_MSG_ERROR(["Error: set [$]1 has not been defined yet"])
fi
} # gp_set_shfn_check
Expand Down
Loading