Skip to content

Commit

Permalink
makefile: manage the manpages via AC_CONFIG_FILES()
Browse files Browse the repository at this point in the history
The AC_CONFIG_FILES macro already known how to handle @Version@
substitution, while also ensuring the input files are in the tarball
(EXTRA_DIST) and substituted files are removed on make distclean
(CONFIG_CLEAN_FILES).

BUG=#2514
  • Loading branch information
evelikov authored and fujiwarat committed Jun 11, 2023
1 parent 1a25975 commit 03a486c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 50 deletions.
12 changes: 1 addition & 11 deletions bus/Makefile.am
Expand Up @@ -163,14 +163,9 @@ test_stress_LDADD = \
$(NULL)

EXTRA_DIST = \
$(man_one_in_files) \
marshalers.list \
$(NULL)

CLEANFILES = \
$(man_one_DATA) \
$(NULL)

$(libibus):
$(MAKE) -C $(top_builddir)/src

Expand All @@ -179,12 +174,7 @@ test: ibus-daemon
G_DEBUG=fatal_warnings \
$(builddir)/ibus-daemon -v

man_one_in_files = ibus-daemon.1.in
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_one_DATA = ibus-daemon.1
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@

-include $(top_srcdir)/git.mk
6 changes: 6 additions & 0 deletions configure.ac
Expand Up @@ -831,6 +831,7 @@ bindings/Makefile
bindings/pygobject/Makefile
bindings/vala/Makefile
bus/Makefile
bus/ibus-daemon.1
bus/services/Makefile
client/Makefile
client/gtk2/Makefile
Expand All @@ -847,6 +848,8 @@ data/icons/Makefile
data/its/Makefile
data/keymaps/Makefile
data/dconf/Makefile
data/dconf/00-upstream-settings.5
data/dconf/ibus.5
docs/Makefile
docs/reference/Makefile
docs/reference/ibus/ibus-docs.sgml
Expand All @@ -858,13 +861,16 @@ ibus/interface/Makefile
m4/Makefile
portal/Makefile
setup/Makefile
setup/ibus-setup.1
src/Makefile
src/compose/Makefile
src/ibusversion.h
src/tests/Makefile
tools/Makefile
tools/ibus.1
ui/Makefile
ui/gtk3/Makefile
ui/gtk3/ibus-emoji.7
util/Makefile
util/IMdkit/Makefile
Makefile
Expand Down
12 changes: 1 addition & 11 deletions data/dconf/Makefile.am
Expand Up @@ -37,13 +37,8 @@ dconfdb_DATA = 00-upstream-settings
$(AM_V_GEN) $(srcdir)/make-dconf-override-db.sh > $@ || \
{ rc=$$?; $(RM) -rf $@; exit $$rc; }

man_5_in_files = 00-upstream-settings.5.in ibus.5.in
man_5_DATA = $(man_5_in_files:.5.in=.5)
man_5_DATA = 00-upstream-settings.5 ibus.5
man_5dir = $(mandir)/man5
%.5: %.5.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@

install-data-hook:
if test -z "$(DESTDIR)"; then \
Expand All @@ -52,16 +47,11 @@ install-data-hook:

EXTRA_DIST = \
$(gsettings_SCHEMAS) \
$(man_5_in_files) \
make-dconf-override-db.sh \
profile/ibus \
00-upstream-settings \
$(NULL)

CLEANFILES = \
$(man_5_DATA) \
$(NULL)

MAINTAINERCLEANFILES = \
00-upstream-settings \
$(NULL)
Expand Down
9 changes: 1 addition & 8 deletions setup/Makefile.am
Expand Up @@ -55,24 +55,17 @@ desktopdir = $(datadir)/applications
org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@

man_one_in_files = ibus-setup.1.in
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_one_DATA = ibus-setup.1
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@

CLEANFILES = \
$(desktop_DATA) \
$(man_one_DATA) \
*.pyc \
ibus-setup \
$(NULL)

EXTRA_DIST = \
$(desktop_notrans_files) \
$(man_one_in_files) \
ibus-setup.in \
setup.ui \
$(NULL)
Expand Down
12 changes: 1 addition & 11 deletions tools/Makefile.am
Expand Up @@ -112,26 +112,16 @@ libibusimmodule_la_LDFLAGS = \
-export-symbols-regex "ibus_.*" \
$(NULL)

man_one_in_files = ibus.1.in
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_one_DATA = ibus.1
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@

EXTRA_DIST = \
$(ibus_immodule_vapi) \
$(ibusimmodule_gir) \
$(man_one_in_files) \
ibus.bash \
IBusIMModule-1.0.metadata \
$(NULL)

CLEANFILES = \
$(man_one_DATA) \
$(NULL)

if ENABLE_EMOJI_DICT
if ENABLE_UI
AM_VALAFLAGS += \
Expand Down
10 changes: 1 addition & 9 deletions ui/gtk3/Makefile.am
Expand Up @@ -147,16 +147,13 @@ emoji_headers = \
ibusemojidialog.h \
$(NULL)

man_seven_in_files = ibus-emoji.7.in

# References:
# libappindicator/src/notification-item.xml
# libappindicator/src/notification-watcher.xml
# kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierItem.xml
# kdelibs/kdeui/knotifications/src/org.kde.StatusNotifierWatcher.xml
EXTRA_DIST = \
$(emoji_headers) \
$(man_seven_in_files) \
emojierapp.vala \
extension.vala \
gtkextension.xml.in \
Expand Down Expand Up @@ -257,12 +254,8 @@ panelbinding.o: $(srcdir)/panelbinding.c

MAINTAINERCLEANFILES += extension.c panelbinding.c

man_seven_DATA = $(man_seven_in_files:.7.in=.7)
man_seven_DATA = ibus-emoji.7
man_sevendir = $(mandir)/man7
%.7: %.7.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@

desktop_in_files = \
ibus-ui-emojier.desktop.in \
Expand All @@ -289,7 +282,6 @@ org.freedesktop.IBus.Panel.Extension.Gtk3.desktop: ibus-extension-gtk3.desktop
CLEANFILES += \
$(desktop_DATA) \
$(desktop_notrans_files) \
$(man_seven_DATA) \
$(NULL)

endif
Expand Down

0 comments on commit 03a486c

Please sign in to comment.