Move meta-enum-type.*.in into meta/

It'll be installed in the meta/ directory, so put the template files in
the corresponding directory in the tarball. This will also simplify the
port to meson.
This commit is contained in:
Jonas Ådahl 2018-07-12 17:10:31 +02:00
parent a97cc84b81
commit 85fbf66179
3 changed files with 6 additions and 6 deletions

View File

@ -672,8 +672,8 @@ pkgconfig_DATA = libmutter-$(LIBMUTTER_API_VERSION).pc
EXTRA_DIST += \ EXTRA_DIST += \
$(wayland_protocols) \ $(wayland_protocols) \
libmutter.pc.in \ libmutter.pc.in \
meta-enum-types.h.in \ meta/meta-enum-types.h.in \
meta-enum-types.c.in \ meta/meta-enum-types.c.in \
org.freedesktop.login1.xml \ org.freedesktop.login1.xml \
org.gnome.Mutter.DisplayConfig.xml \ org.gnome.Mutter.DisplayConfig.xml \
org.gnome.Mutter.IdleMonitor.xml \ org.gnome.Mutter.IdleMonitor.xml \
@ -691,19 +691,19 @@ CLEANFILES += $(MUTTER_STAMP_FILES)
meta/meta-enum-types.h: stamp-meta-enum-types.h Makefile meta/meta-enum-types.h: stamp-meta-enum-types.h Makefile
@true @true
stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in stamp-meta-enum-types.h: $(libmutterinclude_headers) meta/meta-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template meta-enum-types.h.in \ --template meta/meta-enum-types.h.in \
$(libmutterinclude_headers) ) > xgen-teth && \ $(libmutterinclude_headers) ) > xgen-teth && \
(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \ (cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
rm -f xgen-teth && \ rm -f xgen-teth && \
echo timestamp > $(@F) echo timestamp > $(@F)
meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in meta-enum-types.c: stamp-meta-enum-types.h meta/meta-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template meta-enum-types.c.in \ --template meta/meta-enum-types.c.in \
$(libmutterinclude_headers) ) > xgen-tetc && \ $(libmutterinclude_headers) ) > xgen-tetc && \
cp xgen-tetc meta-enum-types.c && \ cp xgen-tetc meta-enum-types.c && \
rm -f xgen-tetc rm -f xgen-tetc