Skip to content

Commit

Permalink
Make peach with doxygen >= 1.8.8 (#131)
Browse files Browse the repository at this point in the history
Doxygen >= 1.8.8 skips files with unknown (or missing) extension,
whereas previously they were assumed C-like. Rename the Doxyheader
files to Doxyheader.h to keep the C-association, adjust makefiles.

Thanks to Pavlina Varekova for chasing this down!
  • Loading branch information
pmatilai committed Feb 6, 2017
1 parent 3a07ba3 commit e843855
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ MAINTAINERCLEANFILES = ChangeLog
# Build hacking docs only on request
if HACKINGDOCS
if DOXYGEN
doc/hacking.doxy: doc/hacking.doxy.in doc/hacking/Doxyheader Makefile.am
doc/hacking.doxy: doc/hacking.doxy.in doc/hacking/Doxyheader.h Makefile.am
$(SED) \
-e "s,\@top_srcdir\@/,$(top_srcdir)/,g" \
-e "s,[@]HAVE_DOT[@],$(HAVE_DOT)," \
Expand All @@ -271,11 +271,11 @@ doc/hacking/html/index.html: doc/hacking.doxy rpmpopt-@VERSION@
noinst_DATA += doc/hacking/html/index.html
endif
endif
EXTRA_DIST += doc/hacking.doxy.in doc/hacking/Doxyheader
EXTRA_DIST += doc/hacking.doxy.in doc/hacking/Doxyheader.h

# Always build librpm docs
if DOXYGEN
doc/librpm.doxy: doc/librpm.doxy.in doc/librpm/Doxyheader Makefile.am configure.ac $(pkginclude_HEADERS)
doc/librpm.doxy: doc/librpm.doxy.in doc/librpm/Doxyheader.h Makefile.am configure.ac $(pkginclude_HEADERS)
files=`echo " $(pkginclude_HEADERS)" | $(SED) -e "s, , \@top_srcdir\@/,g"`; \
$(SED) -e "s,[@]pkginclude_HEADERS[@],$$files," \
-e "s,\@top_srcdir\@/,$(top_srcdir)/,g" \
Expand All @@ -288,7 +288,7 @@ doc/librpm/html/index.html: doc/librpm.doxy
@DOXYGEN@ doc/librpm.doxy
noinst_DATA += doc/librpm/html/index.html
endif
EXTRA_DIST += doc/librpm.doxy.in doc/librpm/Doxyheader
EXTRA_DIST += doc/librpm.doxy.in doc/librpm/Doxyheader.h
EXTRA_DIST += doc/librpm/html

if WITH_INTERNAL_DB
Expand Down
2 changes: 1 addition & 1 deletion doc/hacking.doxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.

INPUT = @top_srcdir@/doc/hacking/Doxyheader \
INPUT = @top_srcdir@/doc/hacking/Doxyheader.h \
@top_srcdir@/config.h \
@top_srcdir@/debug.h \
@top_srcdir@/macros \
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/librpm.doxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.

INPUT = @top_srcdir@/doc/librpm/Doxyheader \
INPUT = @top_srcdir@/doc/librpm/Doxyheader.h \
@pkginclude_HEADERS@

# This tag can be used to specify the character encoding of the source files
Expand Down
File renamed without changes.

0 comments on commit e843855

Please sign in to comment.