From 85fbf66179dcd69d8a4578981cb2a98ef381f916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 12 Jul 2018 17:10:31 +0200 Subject: [PATCH] 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. --- src/Makefile.am | 12 ++++++------ src/{ => meta}/meta-enum-types.c.in | 0 src/{ => meta}/meta-enum-types.h.in | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename src/{ => meta}/meta-enum-types.c.in (100%) rename src/{ => meta}/meta-enum-types.h.in (100%) diff --git a/src/Makefile.am b/src/Makefile.am index a86fe9113..1424c8f72 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -672,8 +672,8 @@ pkgconfig_DATA = libmutter-$(LIBMUTTER_API_VERSION).pc EXTRA_DIST += \ $(wayland_protocols) \ libmutter.pc.in \ - meta-enum-types.h.in \ - meta-enum-types.c.in \ + meta/meta-enum-types.h.in \ + meta/meta-enum-types.c.in \ org.freedesktop.login1.xml \ org.gnome.Mutter.DisplayConfig.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 @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) && \ $(GLIB_MKENUMS) \ - --template meta-enum-types.h.in \ + --template meta/meta-enum-types.h.in \ $(libmutterinclude_headers) ) > xgen-teth && \ (cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \ rm -f xgen-teth && \ 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) && \ $(GLIB_MKENUMS) \ - --template meta-enum-types.c.in \ + --template meta/meta-enum-types.c.in \ $(libmutterinclude_headers) ) > xgen-tetc && \ cp xgen-tetc meta-enum-types.c && \ rm -f xgen-tetc diff --git a/src/meta-enum-types.c.in b/src/meta/meta-enum-types.c.in similarity index 100% rename from src/meta-enum-types.c.in rename to src/meta/meta-enum-types.c.in diff --git a/src/meta-enum-types.h.in b/src/meta/meta-enum-types.h.in similarity index 100% rename from src/meta-enum-types.h.in rename to src/meta/meta-enum-types.h.in